< prev index next >

src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.cpp

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. --- 1,7 ---- /* ! * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation.
*** 434,449 **** } } } ! if (thread->thread_state() == _thread_in_vm || ! thread->thread_state() == _thread_in_native) { if (sig == SIGBUS && thread->doing_unsafe_access()) { - if (UnsafeCopyMemory::contains_pc(pc)) { - npc = UnsafeCopyMemory::page_error_continue_pc(pc); - } stub = SharedRuntime::handle_unsafe_access(thread, npc); } } else if (thread->thread_state() == _thread_in_Java) { --- 434,445 ---- } } } ! if (thread->thread_state() == _thread_in_vm) { if (sig == SIGBUS && thread->doing_unsafe_access()) { stub = SharedRuntime::handle_unsafe_access(thread, npc); } } else if (thread->thread_state() == _thread_in_Java) {
*** 478,492 **** // BugId 4454115: A read from a MappedByteBuffer can fault // here if the underlying file has been truncated. // Do not crash the VM in such a case. CodeBlob* cb = CodeCache::find_blob_unsafe(pc); CompiledMethod* nm = cb->as_compiled_method_or_null(); ! bool is_unsafe_arraycopy = (thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc)); ! if ((nm != NULL && nm->has_unsafe_access()) || is_unsafe_arraycopy) { ! if (is_unsafe_arraycopy) { ! npc = UnsafeCopyMemory::page_error_continue_pc(pc); ! } stub = SharedRuntime::handle_unsafe_access(thread, npc); } } else if (sig == SIGFPE && info->si_code == FPE_INTDIV) { --- 474,484 ---- // BugId 4454115: A read from a MappedByteBuffer can fault // here if the underlying file has been truncated. // Do not crash the VM in such a case. CodeBlob* cb = CodeCache::find_blob_unsafe(pc); CompiledMethod* nm = cb->as_compiled_method_or_null(); ! if (nm != NULL && nm->has_unsafe_access()) { stub = SharedRuntime::handle_unsafe_access(thread, npc); } } else if (sig == SIGFPE && info->si_code == FPE_INTDIV) {
< prev index next >