src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp

rev 57128 : 8235262: Move c2i_entry_barrier for x86_32 to shared

*** 362,371 ****
--- 362,372 ----
    __ call(RuntimeAddress(StubRoutines::x86::method_entry_barrier()));
    __ bind(continuation);
  }
  #endif
  
+ #ifdef _LP64
  void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
    BarrierSetNMethod* bs = BarrierSet::barrier_set()->barrier_set_nmethod();
    if (bs == NULL) {
      return;
    }
*** 391,395 ****
--- 392,436 ----
  
    __ bind(bad_call);
    __ jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
    __ bind(method_live);
  }
+ #else
+ void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
+   BarrierSetNMethod* bs = BarrierSet::barrier_set()->barrier_set_nmethod();
+   if (bs == NULL) {
+     return;
+   }
+ 
+   Label bad_call;
+   __ cmpptr(rbx, 0); // rbx contains the incoming method for c2i adapters.
+   __ jcc(Assembler::equal, bad_call);
+ 
+   Register tmp1 = rax;
+   Register tmp2 = rcx;
+ 
+   __ push(tmp1);
+   __ push(tmp2);
+ 
+   // Pointer chase to the method holder to find out if the method is concurrently unloading.
+   Label method_live;
+   __ load_method_holder_cld(tmp1, rbx);
+ 
+    // Is it a strong CLD?
+   __ cmpl(Address(tmp1, ClassLoaderData::keep_alive_offset()), 0);
+   __ jcc(Assembler::greater, method_live);
+ 
+    // Is it a weak but alive CLD?
+   __ movptr(tmp1, Address(tmp1, ClassLoaderData::holder_offset()));
+   __ resolve_weak_handle(tmp1, tmp2);
+   __ cmpptr(tmp1, 0);
+   __ jcc(Assembler::notEqual, method_live);
+   __ pop(tmp2);
+   __ pop(tmp1);
+ 
+   __ bind(bad_call);
+   __ jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
+   __ bind(method_live);
+   __ pop(tmp2);
+   __ pop(tmp1);
+ }
+ #endif // _LP64