src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java

*** 25,39 ****
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.config;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.referentOffset;
  
  import java.lang.ref.WeakReference;
  
! import org.junit.Assert;
! import org.junit.Test;
! 
! import org.graalvm.compiler.debug.Debug;
! import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.nodes.G1PostWriteBarrier;
  import org.graalvm.compiler.hotspot.nodes.G1PreWriteBarrier;
  import org.graalvm.compiler.hotspot.nodes.G1ReferentFieldReadBarrier;
  import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
--- 25,35 ----
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.config;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.referentOffset;
  
  import java.lang.ref.WeakReference;
  
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.nodes.G1PostWriteBarrier;
  import org.graalvm.compiler.hotspot.nodes.G1PreWriteBarrier;
  import org.graalvm.compiler.hotspot.nodes.G1ReferentFieldReadBarrier;
  import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
*** 51,60 ****
--- 47,58 ----
  import org.graalvm.compiler.phases.common.LoweringPhase;
  import org.graalvm.compiler.phases.common.inlining.InliningPhase;
  import org.graalvm.compiler.phases.common.inlining.policy.InlineEverythingPolicy;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.phases.tiers.MidTierContext;
+ import org.junit.Assert;
+ import org.junit.Test;
  
  import jdk.vm.ci.hotspot.HotSpotInstalledCode;
  import jdk.vm.ci.meta.JavaConstant;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import sun.misc.Unsafe;
*** 254,274 ****
      }
  
      @SuppressWarnings("try")
      private void testHelper(final String snippetName, final int expectedBarriers) throws Exception, SecurityException {
          ResolvedJavaMethod snippet = getResolvedJavaMethod(snippetName);
!         try (Scope s = Debug.scope("WriteBarrierAdditionTest", snippet)) {
!             StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
              HighTierContext highContext = getDefaultHighTierContext();
              MidTierContext midContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
              new InliningPhase(new InlineEverythingPolicy(), new CanonicalizerPhase()).apply(graph, highContext);
              new CanonicalizerPhase().apply(graph, highContext);
              new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highContext);
              new GuardLoweringPhase().apply(graph, midContext);
              new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, midContext);
              new WriteBarrierAdditionPhase(config).apply(graph);
!             Debug.dump(Debug.BASIC_LEVEL, graph, "After Write Barrier Addition");
  
              int barriers = 0;
              if (config.useG1GC) {
                  barriers = graph.getNodes().filter(G1ReferentFieldReadBarrier.class).count() + graph.getNodes().filter(G1PreWriteBarrier.class).count() +
                                  graph.getNodes().filter(G1PostWriteBarrier.class).count();
--- 252,273 ----
      }
  
      @SuppressWarnings("try")
      private void testHelper(final String snippetName, final int expectedBarriers) throws Exception, SecurityException {
          ResolvedJavaMethod snippet = getResolvedJavaMethod(snippetName);
!         DebugContext debug = getDebugContext();
!         try (DebugContext.Scope s = debug.scope("WriteBarrierAdditionTest", snippet)) {
!             StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO, debug);
              HighTierContext highContext = getDefaultHighTierContext();
              MidTierContext midContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
              new InliningPhase(new InlineEverythingPolicy(), new CanonicalizerPhase()).apply(graph, highContext);
              new CanonicalizerPhase().apply(graph, highContext);
              new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highContext);
              new GuardLoweringPhase().apply(graph, midContext);
              new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, midContext);
              new WriteBarrierAdditionPhase(config).apply(graph);
!             debug.dump(DebugContext.BASIC_LEVEL, graph, "After Write Barrier Addition");
  
              int barriers = 0;
              if (config.useG1GC) {
                  barriers = graph.getNodes().filter(G1ReferentFieldReadBarrier.class).count() + graph.getNodes().filter(G1PreWriteBarrier.class).count() +
                                  graph.getNodes().filter(G1PostWriteBarrier.class).count();
*** 303,313 ****
                      Assert.assertEquals(BarrierType.PRECISE, read.getBarrierType());
                      Assert.assertTrue(read.next() instanceof G1ReferentFieldReadBarrier);
                  }
              }
          } catch (Throwable e) {
!             throw Debug.handle(e);
          }
      }
  
      private void test2(final String snippet, Object... args) throws Exception {
          HotSpotInstalledCode code = getInstalledCode(snippet, args[0] instanceof Unsafe);
--- 302,312 ----
                      Assert.assertEquals(BarrierType.PRECISE, read.getBarrierType());
                      Assert.assertTrue(read.next() instanceof G1ReferentFieldReadBarrier);
                  }
              }
          } catch (Throwable e) {
!             throw debug.handle(e);
          }
      }
  
      private void test2(final String snippet, Object... args) throws Exception {
          HotSpotInstalledCode code = getInstalledCode(snippet, args[0] instanceof Unsafe);