src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp

BarrierSetC1_v2

       __ restore();
     }
   }
 }
 
-#undef __
-
 void G1BarrierSetAssembler::barrier_stubs_init() {
   if (dirty_card_log_enqueue == 0) {
     G1BarrierSet* bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
     CardTable *ct = bs->card_table();
     generate_dirty_card_log_enqueue(ct->byte_map_base());

@@ -496,10 +494,13
     generate_satb_log_enqueue(false);
     assert(satb_log_enqueue_frameless != 0, "postcondition.");
   }
 }
 
+#ifdef COMPILER1
+
+#undef __
 #define __ ce->masm()->
 
 void G1BarrierSetAssembler::gen_g1_pre_barrier_stub(LIR_Assembler* ce, G1PreBarrierStub* stub) {
   G1BarrierSetC1* bs = (G1BarrierSetC1*)BarrierSet::barrier_set()->barrier_set_c1();
   // At this point we know that marking is in progress.

@@ -698,5 +699,7
   __ br(Assembler::always, /*annul*/false, Assembler::pt, restart);
   __ epilogue();
 }
 
 #undef __
+
+#endif // COMPILER1