src/cpu/x86/vm/c1_CodeStubs_x86.cpp

rev 2161 : [mq]: initial-intrinsification-changes
rev 2162 : [mq]: code-review-comments-vladimir
rev 2163 : [mq]: client_assertion_fauilure

*** 459,477 ****
  
  /////////////////////////////////////////////////////////////////////////////
  #ifndef SERIALGC
  
  void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
! 
!   // At this point we know that marking is in progress
  
    __ bind(_entry);
    assert(pre_val()->is_register(), "Precondition.");
  
    Register pre_val_reg = pre_val()->as_register();
  
    ce->mem2reg(addr(), pre_val(), T_OBJECT, patch_code(), info(), false /*wide*/, false /*unaligned*/);
  
    __ cmpptr(pre_val_reg, (int32_t) NULL_WORD);
    __ jcc(Assembler::equal, _continuation);
    ce->store_parameter(pre_val()->as_register(), 0);
    __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::g1_pre_barrier_slow_id)));
--- 459,481 ----
  
  /////////////////////////////////////////////////////////////////////////////
  #ifndef SERIALGC
  
  void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
!   // At this point we know that marking is in progress.
!   // If do_load() is true then we have to emit the
!   // load of the previous value; otherwise it has already
!   // been loaded into _pre_val.
  
    __ bind(_entry);
    assert(pre_val()->is_register(), "Precondition.");
  
    Register pre_val_reg = pre_val()->as_register();
  
+   if (do_load()) {
      ce->mem2reg(addr(), pre_val(), T_OBJECT, patch_code(), info(), false /*wide*/, false /*unaligned*/);
+   }
  
    __ cmpptr(pre_val_reg, (int32_t) NULL_WORD);
    __ jcc(Assembler::equal, _continuation);
    ce->store_parameter(pre_val()->as_register(), 0);
    __ call(RuntimeAddress(Runtime1::entry_for(Runtime1::g1_pre_barrier_slow_id)));