src/hotspot/cpu/x86/templateTable_x86.cpp

G1BarrierSet_merge

*** 152,162 ****
                           BarrierSet::Name barrier,
                           bool precise) {
    assert(val == noreg || val == rax, "parameter is just for looks");
    switch (barrier) {
  #if INCLUDE_ALL_GCS
!     case BarrierSet::G1SATBCTLogging:
        {
          // flatten object address if needed
          // We do it regardless of precise because we need the registers
          if (obj.index() == noreg && obj.disp() == 0) {
            if (obj.base() != rdx) {
--- 152,162 ----
                           BarrierSet::Name barrier,
                           bool precise) {
    assert(val == noreg || val == rax, "parameter is just for looks");
    switch (barrier) {
  #if INCLUDE_ALL_GCS
!     case BarrierSet::G1BarrierSet:
        {
          // flatten object address if needed
          // We do it regardless of precise because we need the registers
          if (obj.index() == noreg && obj.disp() == 0) {
            if (obj.base() != rdx) {