src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp

rev 58823 : [mq]: aarch64-jdk-nmethod-barriers-3.patch

*** 730,739 ****
--- 730,742 ----
  
      __ bind(L_skip_barrier);
      c2i_no_clinit_check_entry = __ pc();
    }
  
+   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+   bs->c2i_entry_barrier(masm);
+ 
    gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
  
    __ flush();
    return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
  }
*** 1502,1511 ****
--- 1505,1517 ----
    // Generate a new frame for the wrapper.
    __ enter();
    // -2 because return address is already present and so is saved rfp
    __ sub(sp, sp, stack_size - 2*wordSize);
  
+   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+   bs->nmethod_entry_barrier(masm);
+ 
    // Frame is now completed as far as size and linkage.
    int frame_complete = ((intptr_t)__ pc()) - start;
  
    // We use r20 as the oop handle for the receiver/klass
    // It is callee save so it survives the call to native