src/hotspot/share/opto/lcm.cpp

rev 52371 : [mq]: lvb.patch

@@ -34,11 +34,11 @@
 #include "opto/runtime.hpp"
 #include "opto/chaitin.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_SHENANDOAHGC
-#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
+#include "gc/shenandoah/shenandoahBaseBarrierSetAssembler.hpp"
 #endif
 
 // Optimization - Graph Style
 
 // Check whether val is not-null-decoded compressed oop,

@@ -896,11 +896,11 @@
       proj->_rout.OR(Matcher::method_handle_invoke_SP_save_mask());
   }
 
 #if INCLUDE_SHENANDOAHGC
   if (UseShenandoahGC &&
-      ShenandoahBarrierSetAssembler::is_shenandoah_wb_C_call(mcall->entry_point())) {
+      ShenandoahBaseBarrierSetAssembler::is_shenandoah_wb_C_call(mcall->entry_point())) {
     assert(op == Op_CallLeafNoFP, "shenandoah_wb_C should be called with Op_CallLeafNoFP");
     add_call_kills(proj, regs, save_policy, exclude_soe, true);
   } else
 #endif
   {