src/cpu/x86/vm/sharedRuntime_x86_64.cpp

*** 1414,1424 ****
      }
    }
  }
  
  
! // Check GC_locker::needs_gc and enter the runtime if it's true.  This
  // keeps a new JNI critical region from starting until a GC has been
  // forced.  Save down any oops in registers and describe them in an
  // OopMap.
  static void check_needs_gc_for_critical_native(MacroAssembler* masm,
                                                 int stack_slots,
--- 1414,1424 ----
      }
    }
  }
  
  
! // Check GCLocker::needs_gc and enter the runtime if it's true.  This
  // keeps a new JNI critical region from starting until a GC has been
  // forced.  Save down any oops in registers and describe them in an
  // OopMap.
  static void check_needs_gc_for_critical_native(MacroAssembler* masm,
                                                 int stack_slots,
*** 1426,1438 ****
                                                 int total_in_args,
                                                 int arg_save_area,
                                                 OopMapSet* oop_maps,
                                                 VMRegPair* in_regs,
                                                 BasicType* in_sig_bt) {
!   __ block_comment("check GC_locker::needs_gc");
    Label cont;
!   __ cmp8(ExternalAddress((address)GC_locker::needs_gc_address()), false);
    __ jcc(Assembler::equal, cont);
  
    // Save down any incoming oops and call into the runtime to halt for a GC
  
    OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
--- 1426,1438 ----
                                                 int total_in_args,
                                                 int arg_save_area,
                                                 OopMapSet* oop_maps,
                                                 VMRegPair* in_regs,
                                                 BasicType* in_sig_bt) {
!   __ block_comment("check GCLocker::needs_gc");
    Label cont;
!   __ cmp8(ExternalAddress((address)GCLocker::needs_gc_address()), false);
    __ jcc(Assembler::equal, cont);
  
    // Save down any incoming oops and call into the runtime to halt for a GC
  
    OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
*** 1793,1810 ****
  //
  // Critical native functions are a shorthand for the use of
  // GetPrimtiveArrayCritical and disallow the use of any other JNI
  // functions.  The wrapper is expected to unpack the arguments before
  // passing them to the callee and perform checks before and after the
! // native call to ensure that they GC_locker
  // lock_critical/unlock_critical semantics are followed.  Some other
  // parts of JNI setup are skipped like the tear down of the JNI handle
  // block and the check for pending exceptions it's impossible for them
  // to be thrown.
  //
  // They are roughly structured like this:
! //    if (GC_locker::needs_gc())
  //      SharedRuntime::block_for_jni_critical();
  //    tranistion to thread_in_native
  //    unpack arrray arguments and call native entry point
  //    check for safepoint in progress
  //    check if any thread suspend flags are set
--- 1793,1810 ----
  //
  // Critical native functions are a shorthand for the use of
  // GetPrimtiveArrayCritical and disallow the use of any other JNI
  // functions.  The wrapper is expected to unpack the arguments before
  // passing them to the callee and perform checks before and after the
! // native call to ensure that they GCLocker
  // lock_critical/unlock_critical semantics are followed.  Some other
  // parts of JNI setup are skipped like the tear down of the JNI handle
  // block and the check for pending exceptions it's impossible for them
  // to be thrown.
  //
  // They are roughly structured like this:
! //    if (GCLocker::needs_gc())
  //      SharedRuntime::block_for_jni_critical();
  //    tranistion to thread_in_native
  //    unpack arrray arguments and call native entry point
  //    check for safepoint in progress
  //    check if any thread suspend flags are set