src/hotspot/cpu/arm/templateTable_arm.cpp

G1BarrierSet_merge

*** 191,201 ****
                           bool is_null) {
  
    assert_different_registers(obj.base(), new_val, tmp1, tmp2, tmp3, noreg);
    switch (barrier) {
  #if INCLUDE_ALL_GCS
!     case BarrierSet::G1SATBCTLogging:
        {
          // flatten object address if needed
          assert (obj.mode() == basic_offset, "pre- or post-indexing is not supported here");
  
          const Register store_addr = obj.base();
--- 191,201 ----
                           bool is_null) {
  
    assert_different_registers(obj.base(), new_val, tmp1, tmp2, tmp3, noreg);
    switch (barrier) {
  #if INCLUDE_ALL_GCS
!     case BarrierSet::G1BarrierSet:
        {
          // flatten object address if needed
          assert (obj.mode() == basic_offset, "pre- or post-indexing is not supported here");
  
          const Register store_addr = obj.base();