src/hotspot/cpu/aarch64/templateTable_aarch64.cpp

G1BarrierSet_merge

*** 146,156 ****
                           BarrierSet::Name barrier,
                           bool precise) {
    assert(val == noreg || val == r0, "parameter is just for looks");
    switch (barrier) {
  #if INCLUDE_ALL_GCS
!     case BarrierSet::G1SATBCTLogging:
        {
          // flatten object address if needed
          if (obj.index() == noreg && obj.offset() == 0) {
            if (obj.base() != r3) {
              __ mov(r3, obj.base());
--- 146,156 ----
                           BarrierSet::Name barrier,
                           bool precise) {
    assert(val == noreg || val == r0, "parameter is just for looks");
    switch (barrier) {
  #if INCLUDE_ALL_GCS
!     case BarrierSet::G1BarrierSet:
        {
          // flatten object address if needed
          if (obj.index() == noreg && obj.offset() == 0) {
            if (obj.base() != r3) {
              __ mov(r3, obj.base());