Automatic merge of master into galahad

oracle · Nov 27, 2024 · bb7eff4 · bb7eff4
2 parents 3f6f17c + 7ea55ad
commit bb7eff4
Show file tree

Hide file tree

Showing 415 changed files with 83,467 additions and 3,868 deletions.
diff --git a/...c/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompilationWrapperTest.java b/...c/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompilationWrapperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
 import jdk.graal.compiler.core.test.GraalCompilerTest;
 import jdk.graal.compiler.test.SubprocessUtil;
 import jdk.graal.compiler.test.SubprocessUtil.Subprocess;
-import jdk.graal.compiler.truffle.test.SLTruffleGraalTestSuite;
+import jdk.graal.compiler.truffle.test.SLCompileASTTestSuite;
 
 /**
  * Tests support for dumping graphs and other info useful for debugging a compiler crash.
@@ -207,8 +207,9 @@ public void testTruffleCompilation1() throws IOException, InterruptedException {
                                         "-Djdk.graal.CompilationFailureAction=ExitVM",
                                         "-Dpolyglot.engine.CompilationFailureAction=ExitVM",
                                         "-Dpolyglot.engine.TreatPerformanceWarningsAsErrors=all",
+                                        "-Dpolyglot.engine.AssertProbes=false",
                                         "-Djdk.graal.CrashAt=root test1"),
-                        SLTruffleGraalTestSuite.class.getName(), "test");
+                        SLCompileASTTestSuite.class.getName(), "test");
     }
 
     /**
@@ -226,8 +227,9 @@ public void testTruffleCompilation2() throws IOException, InterruptedException {
                                         "-Djdk.graal.CompilationFailureAction=Silent",
                                         "-Dpolyglot.engine.CompilationFailureAction=ExitVM",
                                         "-Dpolyglot.engine.TreatPerformanceWarningsAsErrors=all",
+                                        "-Dpolyglot.engine.AssertProbes=false",
                                         "-Djdk.graal.CrashAt=root test1:PermanentBailout"),
-                        SLTruffleGraalTestSuite.class.getName(), "test");
+                        SLCompileASTTestSuite.class.getName(), "test");
     }
 
     private static final boolean VERBOSE = Boolean.getBoolean("CompilationWrapperTest.verbose");