Skip to content

Commit bb7eff4

Browse files
Automatic merge of master into galahad
2 parents 3f6f17c + 7ea55ad commit bb7eff4

File tree

415 files changed

+83467
-3868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

415 files changed

+83467
-3868
lines changed

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompilationWrapperTest.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
5050
import jdk.graal.compiler.core.test.GraalCompilerTest;
5151
import jdk.graal.compiler.test.SubprocessUtil;
5252
import jdk.graal.compiler.test.SubprocessUtil.Subprocess;
53-
import jdk.graal.compiler.truffle.test.SLTruffleGraalTestSuite;
53+
import jdk.graal.compiler.truffle.test.SLCompileASTTestSuite;
5454

5555
/**
5656
* Tests support for dumping graphs and other info useful for debugging a compiler crash.
@@ -207,8 +207,9 @@ public void testTruffleCompilation1() throws IOException, InterruptedException {
207207
"-Djdk.graal.CompilationFailureAction=ExitVM",
208208
"-Dpolyglot.engine.CompilationFailureAction=ExitVM",
209209
"-Dpolyglot.engine.TreatPerformanceWarningsAsErrors=all",
210+
"-Dpolyglot.engine.AssertProbes=false",
210211
"-Djdk.graal.CrashAt=root test1"),
211-
SLTruffleGraalTestSuite.class.getName(), "test");
212+
SLCompileASTTestSuite.class.getName(), "test");
212213
}
213214

214215
/**
@@ -226,8 +227,9 @@ public void testTruffleCompilation2() throws IOException, InterruptedException {
226227
"-Djdk.graal.CompilationFailureAction=Silent",
227228
"-Dpolyglot.engine.CompilationFailureAction=ExitVM",
228229
"-Dpolyglot.engine.TreatPerformanceWarningsAsErrors=all",
230+
"-Dpolyglot.engine.AssertProbes=false",
229231
"-Djdk.graal.CrashAt=root test1:PermanentBailout"),
230-
SLTruffleGraalTestSuite.class.getName(), "test");
232+
SLCompileASTTestSuite.class.getName(), "test");
231233
}
232234

233235
private static final boolean VERBOSE = Boolean.getBoolean("CompilationWrapperTest.verbose");

0 commit comments

Comments
 (0)