src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

G1BarrierSet_merge

*** 631,641 ****
    //     Clobbers: r0-r18, v0-v7, v16-v31, except saved_regs.
    //
    void gen_write_ref_array_pre_barrier(Register addr, Register count, bool dest_uninitialized, RegSet saved_regs) {
      BarrierSet* bs = Universe::heap()->barrier_set();
      switch (bs->kind()) {
!     case BarrierSet::G1SATBCTLogging:
        // With G1, don't generate the call if we statically know that the target in uninitialized
        if (!dest_uninitialized) {
          __ push(saved_regs, sp);
          if (count == c_rarg0) {
            if (addr == c_rarg1) {
--- 631,641 ----
    //     Clobbers: r0-r18, v0-v7, v16-v31, except saved_regs.
    //
    void gen_write_ref_array_pre_barrier(Register addr, Register count, bool dest_uninitialized, RegSet saved_regs) {
      BarrierSet* bs = Universe::heap()->barrier_set();
      switch (bs->kind()) {
!     case BarrierSet::G1BarrierSet:
        // With G1, don't generate the call if we statically know that the target in uninitialized
        if (!dest_uninitialized) {
          __ push(saved_regs, sp);
          if (count == c_rarg0) {
            if (addr == c_rarg1) {
***************
*** 678,688 ****
    //  Clobbers: r0-r18, v0-v7, v16-v31, except saved_regs.
    void gen_write_ref_array_post_barrier(Register start, Register end, Register scratch, RegSet saved_regs) {
      assert_different_registers(start, end, scratch);
      BarrierSet* bs = Universe::heap()->barrier_set();
      switch (bs->kind()) {
!       case BarrierSet::G1SATBCTLogging:
  
          {
            __ push(saved_regs, sp);
            // must compute element count unless barrier set interface is changed (other platforms supply count)
            assert_different_registers(start, end, scratch);
--- 678,688 ----
    //  Clobbers: r0-r18, v0-v7, v16-v31, except saved_regs.
    void gen_write_ref_array_post_barrier(Register start, Register end, Register scratch, RegSet saved_regs) {
      assert_different_registers(start, end, scratch);
      BarrierSet* bs = Universe::heap()->barrier_set();
      switch (bs->kind()) {
!       case BarrierSet::G1BarrierSet:
  
          {
            __ push(saved_regs, sp);
            // must compute element count unless barrier set interface is changed (other platforms supply count)
            assert_different_registers(start, end, scratch);