Merge upstream-jdk

src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java

@@ -184,6 +184,9 @@ protected void preprocessArgument(Object arg) {
         if (arg instanceof Type type) {
             preprocessType(type);
         }
+        else if (arg instanceof JCDiagnostic.AnnotatedType type) {
+            preprocessType(type.type());
+        }
         else if (arg instanceof Symbol symbol) {
             preprocessSymbol(symbol);
         }

test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.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
@@ -27,6 +27,7 @@
  * @test TestMinInitialErgonomics
  * @bug 8006088
  * @requires vm.gc.Parallel
+ * @requires vm.compMode != "Xcomp"
  * @summary Test Parallel GC ergonomics decisions related to minimum and initial heap size.
  * @library /test/lib
  * @library /

test/jdk/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java

@@ -75,7 +75,6 @@ public static void main(String[] argv)
         // threads block after doing some computation
         waitUntilThreadBlocked();
 
-
         long times[] = mbean.getThreadCpuTime(ids);
         long userTimes[] = mbean.getThreadUserTime(ids);
 
@@ -222,6 +221,8 @@ private static void waitUntilThreadBlocked()
                 }
             }
         }
+        // Account for threads using CPU for a few millis after their WAITING state is visible:
+        goSleep(500);
     }
 
     public static void doit() {

test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.java

@@ -0,0 +1,19 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8334757
+ * @compile/fail/ref=CantAnnotateClassWithTypeVariable.out -XDrawDiagnostics CantAnnotateClassWithTypeVariable.java
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+public class CantAnnotateClassWithTypeVariable {
+  @Target(ElementType.TYPE_USE)
+  @interface TA {}
+
+  static class A {
+    static class B<T> {}
+  }
+
+  <T> @TA A.B<T> f() {}
+}

test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.out

@@ -0,0 +1,2 @@
+CantAnnotateClassWithTypeVariable.java:18:14: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @CantAnnotateClassWithTypeVariable.TA), CantAnnotateClassWithTypeVariable.A, @CantAnnotateClassWithTypeVariable.TA CantAnnotateClassWithTypeVariable.A.B<T>
+1 error