src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java

*** 109,119 ****
  import org.graalvm.compiler.phases.BasePhase;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.Phase;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
! import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
  import org.graalvm.compiler.phases.common.inlining.InliningPhase;
  import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
  import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy;
  import org.graalvm.compiler.phases.schedule.SchedulePhase;
  import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
--- 109,119 ----
  import org.graalvm.compiler.phases.BasePhase;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.Phase;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
! import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
  import org.graalvm.compiler.phases.common.inlining.InliningPhase;
  import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
  import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy;
  import org.graalvm.compiler.phases.schedule.SchedulePhase;
  import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
*** 897,911 ****
              Assert.assertEquals("wrong number of deopt counts for " + reason, (int) deoptCounts.get(reason), profile.getDeoptimizationCount(reason));
          }
          return actual;
      }
  
      protected void assertEquals(Result expect, Result actual) {
          if (expect.exception != null) {
              Assert.assertTrue("expected " + expect.exception, actual.exception != null);
              Assert.assertEquals("Exception class", expect.exception.getClass(), actual.exception.getClass());
!             Assert.assertEquals("Exception message", expect.exception.getMessage(), actual.exception.getMessage());
          } else {
              if (actual.exception != null) {
                  throw new AssertionError("expected " + expect.returnValue + " but got an exception", actual.exception);
              }
              assertDeepEquals(expect.returnValue, actual.returnValue);
--- 897,921 ----
              Assert.assertEquals("wrong number of deopt counts for " + reason, (int) deoptCounts.get(reason), profile.getDeoptimizationCount(reason));
          }
          return actual;
      }
  
+     private static final List<Class<?>> C2_OMIT_STACK_TRACE_IN_FAST_THROW_EXCEPTIONS = Arrays.asList(
+                     ArithmeticException.class,
+                     ArrayIndexOutOfBoundsException.class,
+                     ArrayStoreException.class,
+                     ClassCastException.class,
+                     NullPointerException.class);
+ 
      protected void assertEquals(Result expect, Result actual) {
          if (expect.exception != null) {
              Assert.assertTrue("expected " + expect.exception, actual.exception != null);
              Assert.assertEquals("Exception class", expect.exception.getClass(), actual.exception.getClass());
!             // C2 can optimize out the stack trace and message in some cases
!             if (expect.exception.getMessage() != null || !C2_OMIT_STACK_TRACE_IN_FAST_THROW_EXCEPTIONS.contains(expect.exception.getClass())) {
!                 Assert.assertEquals("Exception message", expect.exception.getMessage(), actual.exception.getMessage());
!             }
          } else {
              if (actual.exception != null) {
                  throw new AssertionError("expected " + expect.returnValue + " but got an exception", actual.exception);
              }
              assertDeepEquals(expect.returnValue, actual.returnValue);