mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

8339678: Update runtime/condy tests to be executed with VM flags

Browse Source 
Reviewed-by: coleenp
This commit is contained in:
Leonid Mesnik
2024-09-11 22:06:23 +00:00
parent b0cff6b528
commit c3711dc909
6 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/ProblemList-Xcomp.txt
View File

@@ -51,3 +51,5 @@ vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 829
vmTestbase/nsk/stress/thread/thread006.java 8321476 linux-all
gc/arguments/TestNewSizeFlags.java 8299116 macosx-aarch64
runtime/condy/escapeAnalysis/TestEscapeCondy.java 8339694 generic-all

7
test/hotspot/jtreg/runtime/condy/BadBSMUseTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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
@@ -25,7 +25,6 @@
* @test
* @bug 8186211
* @summary CONSTANT_Dynamic_info structure's tries to use a BSM index whose signature is for an invokedynamic and vice versa.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile CondyUsesIndyBSM.jcod
@@ -42,7 +41,7 @@ public class BadBSMUseTest {
public static void main(String args[]) throws Throwable {
// 1. Test a CONSTANT_Dynamic_info's bootstrap_method_attr_index points
// at a BSM meant for a CONSTANT_InvokeDynamic_info
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("CondyUsesIndyBSM");
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("CondyUsesIndyBSM");
OutputAnalyzer oa = new OutputAnalyzer(pb.start());
oa.shouldContain("In Indybsm target CallSite method foo");
oa.shouldContain("BootstrapMethodError: bootstrap method initialization exception");
@@ -50,7 +49,7 @@ public class BadBSMUseTest {
// 2. Test a CONSTANT_InvokeDynamic_info's bootstrap_method_attr_index points
// at a BSM meant for a CONSTANT_Dynamic_info
pb = ProcessTools.createLimitedTestJavaProcessBuilder("IndyUsesCondyBSM");
pb = ProcessTools.createTestJavaProcessBuilder("IndyUsesCondyBSM");
oa = new OutputAnalyzer(pb.start());
oa.shouldContain("In Condybsm");
oa.shouldContain("BootstrapMethodError: bootstrap method initialization exception");

9
test/hotspot/jtreg/runtime/condy/CondyLDCTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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
@@ -25,7 +25,6 @@
* @test
* @bug 8186211
* @summary Tests various ldc, ldc_w, ldc2_w instructions of CONSTANT_Dynamic.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile CondyUseLDC_W.jasm
@@ -42,7 +41,7 @@ public class CondyLDCTest {
public static void main(String args[]) throws Throwable {
// 1. Test a ldc_w instruction can be used with condy's which generate
// loadable constants of the following types: byte, char, short, float, integer, boolean.
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Xverify:all",
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("-Xverify:all",
"CondyUseLDC_W");
OutputAnalyzer oa = new OutputAnalyzer(pb.start());
oa.shouldNotContain("VerifyError");
@@ -50,7 +49,7 @@ public class CondyLDCTest {
// 2. Test ldc2_w of a condy which returns a dynamically generated
// float constant, generates a VerifyError.
pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Xverify:all",
pb = ProcessTools.createTestJavaProcessBuilder("-Xverify:all",
"CondyBadLDC2_W");
oa = new OutputAnalyzer(pb.start());
oa.shouldContain("java.lang.VerifyError: Illegal type at constant pool entry");
@@ -59,7 +58,7 @@ public class CondyLDCTest {
// 3. Test a ldc of a condy which returns a dynamically generated
// double constant, generates a VerifyError.
pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Xverify:all",
pb = ProcessTools.createTestJavaProcessBuilder("-Xverify:all",
"CondyBadLDC");
oa = new OutputAnalyzer(pb.start());
oa.shouldContain("java.lang.VerifyError: Illegal type at constant pool entry");

5
test/hotspot/jtreg/runtime/condy/CondyNewInvokeSpecialTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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
@@ -25,7 +25,6 @@
* @test
* @bug 8186211
* @summary Test CONSTANT_Dynamic where the BSM is invoked via a REF_newInvokeSpecial.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile CondyNewInvokeSpecial.jasm
@@ -38,7 +37,7 @@ import jdk.test.lib.compiler.InMemoryJavaCompiler;
public class CondyNewInvokeSpecialTest {
public static void main(String args[]) throws Throwable {
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Xverify:all",
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("-Xverify:all",
"CondyNewInvokeSpecial");
OutputAnalyzer oa = new OutputAnalyzer(pb.start());
oa.shouldContain("In CondyNewInvokeSpecial <init> method");

5
test/hotspot/jtreg/runtime/condy/escapeAnalysis/TestEscapeCondy.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 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
@@ -26,7 +26,6 @@
* @bug 8216970
* @summary Ensure escape analysis can handle an ldc of a dynamic
* constant whose return type is an array of boolean.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile TestEscapeThroughInvokeWithCondy$A.jasm
@@ -43,7 +42,7 @@ public class TestEscapeCondy {
public static void main(String args[]) throws Throwable {
// 1. Test escape analysis of a method that contains
// a ldc instruction of a condy whose return type is an array of boolean
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
"-XX:CompileCommand=dontinline,runtime.condy.TestEscapeThroughInvokeWithCondy::create",
"runtime.condy.TestEscapeThroughInvokeWithCondy");
OutputAnalyzer oa = new OutputAnalyzer(pb.start());

6
test/hotspot/jtreg/runtime/condy/staticInit/TestInitException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 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
@@ -25,7 +25,6 @@
* @test
* @bug 8228485
* @summary Correctly handle initialization error for Condy BSM.
* @requires vm.flagless
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @compile Example.jasm
@@ -38,7 +37,7 @@ import jdk.test.lib.process.OutputAnalyzer;
public class TestInitException {
public static void main(java.lang.String[] unused) throws Exception {
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("Example");
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("Example");
OutputAnalyzer oa = new OutputAnalyzer(pb.start());
// First call stack trace
// shouldMatch is used to workaround CODETOOLS-7902686
@@ -52,4 +51,3 @@ public class TestInitException {
oa.shouldHaveExitValue(1);
}
}