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

*** 22,31 ****
--- 22,32 ----
   */
  
  
  package org.graalvm.compiler.hotspot.test;
  
+ import static org.graalvm.compiler.debug.DebugOptions.DumpOnError;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
  import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
  import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
  
*** 50,59 ****
--- 51,61 ----
  import org.graalvm.compiler.nodeinfo.NodeInfo;
  import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.spi.LIRLowerable;
  import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+ import org.graalvm.compiler.options.OptionValues;
  import org.junit.Test;
  
  import jdk.vm.ci.code.BytecodeFrame;
  import jdk.vm.ci.code.CodeCacheProvider;
  import jdk.vm.ci.code.VirtualObject;
*** 137,146 ****
--- 139,156 ----
  
      private void test(TestSpec spec) {
          test(getDebugContext(), spec);
      }
  
+     /**
+      * Avoids dumping during tests which are expected to fail.
+      */
+     private void testNoDump(TestSpec spec) {
+         OptionValues options = new OptionValues(getInitialOptions(), DumpOnError, false);
+         test(getDebugContext(options, null, null), spec);
+     }
+ 
      private void test(DebugContext debug, TestSpec spec) {
          ResolvedJavaMethod method = getResolvedJavaMethod("testMethod");
  
          StructuredGraph graph = parseForCompile(method, debug);
          TestNode test = graph.add(new TestNode(spec));
*** 152,162 ****
          codeCache.addCode(method, compiledCode, null, null);
      }
  
      @Test(expected = Error.class)
      public void testInvalidShortOop() {
!         test((tool, state, safepoint) -> {
              PlatformKind kind = tool.target().arch.getPlatformKind(JavaKind.Short);
              LIRKind lirKind = LIRKind.reference(kind);
  
              Variable var = tool.newVariable(lirKind);
              tool.append(new ValueDef(var));
--- 162,172 ----
          codeCache.addCode(method, compiledCode, null, null);
      }
  
      @Test(expected = Error.class)
      public void testInvalidShortOop() {
!         testNoDump((tool, state, safepoint) -> {
              PlatformKind kind = tool.target().arch.getPlatformKind(JavaKind.Short);
              LIRKind lirKind = LIRKind.reference(kind);
  
              Variable var = tool.newVariable(lirKind);
              tool.append(new ValueDef(var));
*** 165,175 ****
          });
      }
  
      @Test(expected = Error.class)
      public void testInvalidShortDerivedOop() {
!         test((tool, state, safepoint) -> {
              Variable baseOop = tool.newVariable(LIRKind.fromJavaKind(tool.target().arch, JavaKind.Object));
              tool.append(new ValueDef(baseOop));
  
              PlatformKind kind = tool.target().arch.getPlatformKind(JavaKind.Short);
              LIRKind lirKind = LIRKind.derivedReference(kind, baseOop, false);
--- 175,185 ----
          });
      }
  
      @Test(expected = Error.class)
      public void testInvalidShortDerivedOop() {
!         testNoDump((tool, state, safepoint) -> {
              Variable baseOop = tool.newVariable(LIRKind.fromJavaKind(tool.target().arch, JavaKind.Object));
              tool.append(new ValueDef(baseOop));
  
              PlatformKind kind = tool.target().arch.getPlatformKind(JavaKind.Short);
              LIRKind lirKind = LIRKind.derivedReference(kind, baseOop, false);