< prev index next >

src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp

Print this page

        

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * 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.

@@ -515,17 +515,13 @@
     if ((sig == SIGSEGV) && VM_Version::is_cpuinfo_segv_addr(pc)) {
       // Verify that OS save/restore AVX registers.
       stub = VM_Version::cpuinfo_cont_addr();
     }
 
-    if (thread->thread_state() == _thread_in_vm ||
-         thread->thread_state() == _thread_in_native) {
+    if (thread->thread_state() == _thread_in_vm) {
       if (sig == SIGBUS && info->si_code == BUS_OBJERR && thread->doing_unsafe_access()) {
         address next_pc = Assembler::locate_next_instruction(pc);
-        if (UnsafeCopyMemory::contains_pc(pc)) {
-          next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
-        }
         stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
       }
     }
 
     if (thread->thread_state() == _thread_in_Java) {

@@ -538,16 +534,12 @@
         // here if the underlying file has been truncated.
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
         if (cb != NULL) {
           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 (nm != NULL && nm->has_unsafe_access()) {
             address next_pc = Assembler::locate_next_instruction(pc);
-            if (is_unsafe_arraycopy) {
-              next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
-            }
             stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
           }
         }
       }
       else
< prev index next >