the type of the additional parameter to this visitor's
+ * methods. Use {@code Void} for visitors that do not need an
+ * additional parameter.
+ *
* @since 1.8
*/
public class DocTreePathScanner the type of the additional parameter to this visitor's
+ * methods. Use {@code Void} for visitors that do not need an
+ * additional parameter.
+ *
* @since 1.8
*/
public class DocTreeScanner the type of the additional parameter to this visitor's
+ * methods. Use {@code Void} for visitors that do not need an
+ * additional parameter.
+ *
* @author Jonathan Gibbons
* @since 1.6
*/
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
index 50e09b7c45c..e502a5dc395 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java
@@ -518,7 +518,7 @@ public interface ThreadReference extends ObjectReference {
*
* @since 19
*/
- @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
+ @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
default boolean isVirtual() {
throw new UnsupportedOperationException("Method not implemented");
}
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
index 9d127cb52f0..8695113d2cc 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
@@ -72,7 +72,7 @@ public interface ThreadDeathRequest extends EventRequest {
*
* @since 19
*/
- @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
+ @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
default void addPlatformThreadsOnlyFilter() {
throw new UnsupportedOperationException("Method not implemented");
}
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java
index 8319059d62b..0e17f868470 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/request/ThreadStartRequest.java
@@ -72,7 +72,7 @@ public interface ThreadStartRequest extends EventRequest {
*
* @since 19
*/
- @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
+ @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
default void addPlatformThreadsOnlyFilter() {
throw new UnsupportedOperationException("Method not implemented");
}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java
index 35c1b8a0ea6..08934d1f995 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java
@@ -110,7 +110,7 @@ public final class RecordedThread extends RecordedObject {
*
* @since 19
*/
- @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
+ @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
public boolean isVirtual() {
return getTyped("virtual", Boolean.class, Boolean.FALSE);
}
diff --git a/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
index e63d3acfab4..76c07781da4 100644
--- a/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
+++ b/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
@@ -149,7 +149,7 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
* @throws UnsupportedOperationException if this operation is not supported
* @since 19
*/
- @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
+ @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
default void dumpThreads(String outputFile, ThreadDumpFormat format) throws IOException {
throw new UnsupportedOperationException();
}
@@ -158,7 +158,7 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
* Thread dump format.
* @since 19
*/
- @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS)
+ @PreviewFeature(feature = PreviewFeature.Feature.VIRTUAL_THREADS, reflective = true)
public static enum ThreadDumpFormat {
/**
* Plain text format.
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 51eadeb7375..2ae606f04f9 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -83,6 +83,7 @@ gc/stress/gclocker/TestGCLockerWithParallel.java 8180622 generic-all
gc/stress/gclocker/TestGCLockerWithG1.java 8180622 generic-all
gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java 8192647 generic-all
gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8241293 macosx-x64
+gc/stress/TestStressG1Humongous.java 8286554 windows-x64
#############################################################################
@@ -120,8 +121,6 @@ serviceability/sa/ClhsdbPstack.java#core 8269982,8267433 macosx-aarch64,macosx-x
serviceability/sa/TestJmapCore.java 8269982,8267433 macosx-aarch64,macosx-x64
serviceability/sa/TestJmapCoreMetaspace.java 8269982,8267433 macosx-aarch64,macosx-x64
-serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java 8288214 generic-all
-
#############################################################################
# :hotspot_misc
diff --git a/test/hotspot/jtreg/compiler/intrinsics/klass/TestGetModifiers.java b/test/hotspot/jtreg/compiler/intrinsics/klass/TestGetModifiers.java
new file mode 100644
index 00000000000..eb0bed6e012
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/intrinsics/klass/TestGetModifiers.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2022, Red Hat, Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @library /test/lib
+ * @run main/othervm -Xint
+ * -XX:CompileCommand=dontinline,*TestGetModifiers.test
+ * compiler.intrinsics.klass.TestGetModifiers
+ */
+
+/*
+ * @test
+ * @requires vm.compiler1.enabled
+ * @library /test/lib
+ * @run main/othervm -XX:TieredStopAtLevel=1 -XX:+TieredCompilation
+ * -XX:CompileCommand=dontinline,*TestGetModifiers.test
+ * compiler.intrinsics.klass.TestGetModifiers
+ */
+
+/*
+ * @test
+ * @requires vm.compiler2.enabled
+ * @library /test/lib
+ * @run main/othervm -XX:-TieredCompilation
+ * -XX:CompileCommand=dontinline,*TestGetModifiers.test
+ * compiler.intrinsics.klass.TestGetModifiers
+ */
+
+package compiler.intrinsics.klass;
+
+import java.lang.reflect.Modifier;
+import static java.lang.reflect.Modifier.*;
+
+import jdk.test.lib.Asserts;
+
+public class TestGetModifiers {
+ public static class T1 {
+ }
+
+ public static final class T2 {
+ }
+
+ private static class T3 {
+ }
+
+ protected static class T4 {
+ }
+
+ class T5 {
+ }
+
+ interface T6 {
+ }
+
+ static void test(Class cl, int expectedMods) {
+ for (int i = 0; i < 100_000; i++) {
+ int actualMods = cl.getModifiers();
+ if (actualMods != expectedMods) {
+ throw new IllegalStateException("Error with: " + cl);
+ }
+ }
+ }
+
+ public static void main(String... args) {
+ test(T1.class, PUBLIC | STATIC);
+ test(T2.class, PUBLIC | FINAL | STATIC);
+ test(T3.class, PRIVATE | STATIC);
+ test(T4.class, PROTECTED | STATIC);
+ test(new TestGetModifiers().new T5().getClass(), 0);
+ test(T6.class, ABSTRACT | STATIC | INTERFACE);
+
+ test(int.class, PUBLIC | ABSTRACT | FINAL);
+ test(long.class, PUBLIC | ABSTRACT | FINAL);
+ test(double.class, PUBLIC | ABSTRACT | FINAL);
+ test(float.class, PUBLIC | ABSTRACT | FINAL);
+ test(char.class, PUBLIC | ABSTRACT | FINAL);
+ test(byte.class, PUBLIC | ABSTRACT | FINAL);
+ test(short.class, PUBLIC | ABSTRACT | FINAL);
+ test(void.class, PUBLIC | ABSTRACT | FINAL);
+ test(int[].class, PUBLIC | ABSTRACT | FINAL);
+ test(long[].class, PUBLIC | ABSTRACT | FINAL);
+ test(double[].class, PUBLIC | ABSTRACT | FINAL);
+ test(float[].class, PUBLIC | ABSTRACT | FINAL);
+ test(char[].class, PUBLIC | ABSTRACT | FINAL);
+ test(byte[].class, PUBLIC | ABSTRACT | FINAL);
+ test(short[].class, PUBLIC | ABSTRACT | FINAL);
+ test(Object[].class, PUBLIC | ABSTRACT | FINAL);
+ test(TestGetModifiers[].class, PUBLIC | ABSTRACT | FINAL);
+
+ test(new TestGetModifiers().getClass(), PUBLIC);
+ test(new T1().getClass(), PUBLIC | STATIC);
+ test(new T2().getClass(), PUBLIC | FINAL | STATIC);
+ test(new T3().getClass(), PRIVATE | STATIC);
+ test(new T4().getClass(), PROTECTED | STATIC);
+ }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java
index 57b7a07a65c..d4d8054cb0e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/VThreadNotifyFramePopTest.java
@@ -23,11 +23,13 @@
/**
* @test
+ * @bug 8284161 8288214
* @summary Verifies that FRAME_POP event is delivered when called from URL.openStream().
* @requires vm.continuations
- * @compile --enable-preview -source ${jdk.version} VThreadNotifyFramePopTest.java
+ * @enablePreview
+ * @modules jdk.httpserver
+ * @library /test/lib
* @run main/othervm/native
- * --enable-preview
* -agentlib:VThreadNotifyFramePopTest
* -Djdk.defaultScheduler.parallelism=2 -Djdk.defaultScheduler.maxPoolSize=2
* VThreadNotifyFramePopTest
@@ -35,8 +37,8 @@
/*
* This test reproduces a bug with NotifyFramePop not working properly when called
- * from URL.openStream() while executing on a VThread. The FRAME_POP event is never
- * delivered.
+ * from URL.openStream() while executing on a virtual thread. The FRAME_POP event is
+ * never delivered.
*
* The test first sets up a breakpoint on URL.openStream(). Once it is hit the test
* does a NotifyFramePop on the current frame, and also sets up a breakpoint on
@@ -44,12 +46,17 @@
* returns. The expaction is that the FRAME_POP event should be delevered before
* hitting the breakpoint in brkpoint().
*/
+import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
import java.net.URL;
import java.time.Duration;
import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
+import com.sun.net.httpserver.HttpServer;
+import jdk.test.lib.net.URIBuilder;
public class VThreadNotifyFramePopTest {
private static final String agentLib = "VThreadNotifyFramePopTest";
@@ -57,6 +64,24 @@ public class VThreadNotifyFramePopTest {
static native void enableEvents(Thread thread, Class testClass, Class urlClass);
static native boolean check();
+
+ /**
+ * Creates a HTTP server bound to the loopback address. The server responds to
+ * the request "/hello" with a message.
+ */
+ static HttpServer createHttpServer() throws IOException {
+ InetAddress lb = InetAddress.getLoopbackAddress();
+ HttpServer server = HttpServer.create(new InetSocketAddress(lb, 0), 16);
+ server.createContext("/hello", e -> {
+ byte[] response = "Hello".getBytes("UTF-8");
+ e.sendResponseHeaders(200, response.length);
+ try (OutputStream out = e.getResponseBody()) {
+ out.write(response);
+ }
+ });
+ return server;
+ }
+
static int brkpoint() {
return 5;
}
@@ -71,25 +96,37 @@ public class VThreadNotifyFramePopTest {
}
static void run4() {
try {
- URL url = URI.create("http://openjdk.java.net/").toURL();
- try (InputStream in = url.openStream()) {
- brkpoint();
- in.readAllBytes();
- System.out.println("readAllBytes done");
+ HttpServer server = createHttpServer();
+ server.start();
+ try {
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(server.getAddress().getPort())
+ .path("/hello")
+ .toURL();
+ System.out.println("open " + url);
+ try (InputStream in = url.openStream()) {
+ brkpoint();
+ System.out.println("reading response");
+ in.readAllBytes();
+ }
+ } finally {
+ System.out.println("stop server");
+ server.stop(1);
}
- System.out.println("try done");
} catch (Exception e) {
- e.printStackTrace();
+ throw new RuntimeException(e);
}
System.out.println("run done");
}
void runTest() throws Exception {
enableEvents(Thread.currentThread(), VThreadNotifyFramePopTest.class, URL.class);
- ThreadFactory factory = Thread.ofVirtual().factory();
- try (var executor = Executors.newThreadPerTaskExecutor(factory)) {
- executor.submit(VThreadNotifyFramePopTest::run);
- System.out.println("submit done");
+ try (var executor = Executors.newVirtualThreadPerTaskExecutor()) {
+ var future = executor.submit(VThreadNotifyFramePopTest::run);
+ System.out.println("virtual thread started");
+ future.get();
}
System.out.println("Step::main done");
}
diff --git a/test/jdk/ProblemList-Xcomp.txt b/test/jdk/ProblemList-Xcomp.txt
index 94283fd855b..e3ab347f5f5 100644
--- a/test/jdk/ProblemList-Xcomp.txt
+++ b/test/jdk/ProblemList-Xcomp.txt
@@ -30,3 +30,4 @@
java/lang/invoke/MethodHandles/CatchExceptionTest.java 8146623 generic-all
java/lang/ref/ReferenceEnqueue.java 8284236 generic-all
java/lang/ref/OOMEInReferenceHandler.java 8066859 generic-all
+java/lang/reflect/callerCache/ReflectionCallerCacheTest.java 8288286 macosx-x64,windows-x64