src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp

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

*** 405,421 ****
  
  ///////////////////////////////////////////////////////////////////////////////////
  #ifndef SERIALGC
  
  void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
    __ 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*/);
    if (__ is_in_wdisp16_range(_continuation)) {
      __ br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pt,
                        pre_val_reg, _continuation);
    } else {
      __ cmp(pre_val_reg, G0);
--- 405,428 ----
  
  ///////////////////////////////////////////////////////////////////////////////////
  #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*/);
+   }
+ 
    if (__ is_in_wdisp16_range(_continuation)) {
      __ br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pt,
                        pre_val_reg, _continuation);
    } else {
      __ cmp(pre_val_reg, G0);