Skip to content
Permalink
Browse files
8277878: Fix compiler tests after JDK-8275908
Reviewed-by: thartmann, chagedorn
  • Loading branch information
simonis committed Nov 29, 2021
1 parent 960bdde commit 614c6e61fa3a9f094a311b12e780491c611657e6
Showing with 4 additions and 3 deletions.
  1. +1 −1 test/hotspot/jtreg/compiler/exceptions/OptimizeImplicitExceptions.java
  2. +3 −2 test/hotspot/jtreg/compiler/uncommontrap/Decompile.java
@@ -32,7 +32,7 @@
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UseSerialGC -Xbatch -XX:-UseOnStackReplacement -XX:-TieredCompilation
* -Xbatch -XX:-UseOnStackReplacement -XX:-TieredCompilation
* -XX:CompileCommand=compileonly,compiler.exceptions.OptimizeImplicitExceptions::throwImplicitException
* compiler.exceptions.OptimizeImplicitExceptions
*/
@@ -32,7 +32,7 @@
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UseSerialGC -Xbatch -XX:-UseOnStackReplacement -XX:-TieredCompilation
* -Xbatch -XX:-UseOnStackReplacement -XX:-TieredCompilation
* -XX:CompileCommand=compileonly,compiler.uncommontrap.Decompile::uncommonTrap
* -XX:CompileCommand=inline,compiler.uncommontrap.Decompile*::foo
* compiler.uncommontrap.Decompile
@@ -54,7 +54,8 @@ public class Decompile {
private static final int Tier0InvokeNotifyFreq = (int)Math.pow(2, WB.getIntxVMFlag("Tier0InvokeNotifyFreqLog"));
// VM builds without JVMCI like x86_32 call the bimorphic inlining trap just 'bimorphic'
// while all the other builds with JVMCI call it 'bimorphic_or_optimized_type_check'.
private static final boolean isJVMCISupported = WhiteBox.getWhiteBox().isJVMCISupportedByGC();
// Only builds with JVMCI have the "EnableJVMCI" flag.
private static final boolean isJVMCISupported = (WB.getBooleanVMFlag("EnableJVMCI") != null);
private static final String bimorphicTrapName = isJVMCISupported ? "bimorphic_or_optimized_type_check" : "bimorphic";

static class Base {

1 comment on commit 614c6e6

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 614c6e6 Nov 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.