src/hotspot/cpu/sparc/templateTable_sparc.cpp

G1BarrierSet_merge

*** 53,63 ****
                           bool precise) {
    assert(tmp != val && tmp != base && tmp != index, "register collision");
    assert(index == noreg || offset == 0, "only one offset");
    switch (barrier) {
  #if INCLUDE_ALL_GCS
!     case BarrierSet::G1SATBCTLogging:
        {
          // Load and record the previous value.
          __ g1_write_barrier_pre(base, index, offset,
                                  noreg /* pre_val */,
                                  tmp, true /*preserve_o_regs*/);
--- 53,63 ----
                           bool precise) {
    assert(tmp != val && tmp != base && tmp != index, "register collision");
    assert(index == noreg || offset == 0, "only one offset");
    switch (barrier) {
  #if INCLUDE_ALL_GCS
!     case BarrierSet::G1BarrierSet:
        {
          // Load and record the previous value.
          __ g1_write_barrier_pre(base, index, offset,
                                  noreg /* pre_val */,
                                  tmp, true /*preserve_o_regs*/);