From 895b48fc7fbb64f6e0ca4eee420d79fd2ff24110 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Wed, 5 Nov 2025 08:43:34 +0100
Subject: [PATCH] Update tests

---
 .../.CompletionErrorOnEnclosingType.java.swp  | Bin 0 -> 16384 bytes
 .../CompletionErrorOnEnclosingType.java       |  97 ++++++++++++++++--
 2 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 test/langtools/tools/javac/annotations/typeAnnotations/.CompletionErrorOnEnclosingType.java.swp

diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/.CompletionErrorOnEnclosingType.java.swp b/test/langtools/tools/javac/annotations/typeAnnotations/.CompletionErrorOnEnclosingType.java.swp
new file mode 100644
index 0000000000000000000000000000000000000000..8020d3bd75d1df557e32560d2327bf5cf6312520
GIT binary patch
literal 16384
zcmeHNYltLQ6|TgX#Aq}cBZw$B9hTHgdhR?n$-Xz+)7!J#$-M0D$!1v=sjj*`UD@iY
z&aJBM88;6w{t!h(At7So3L+??DELzZF%c3W<d;7L%>xCEXnZ7M5Q*Qpb*rm;dS-Ts
zAd#&ezUl5;=RVGN&%O7Y)3-TuZ*_?s;Ijr^HyFm5x2|)aS$@>GHn_sD<FFn0^kDZ_
zA~)5s>^Uw2tHWJC64JN4E!7@Q1gAr3Pv7sHn~p>nO?#HV9tD9HPAC8Gw|bU6ZTWr>
zS&<v~DBtXg($M#E(CK=Do>im_<ceSMZ7&F2f4u=oP7Q47IRBb6aJe%ON3E&-*Bg81
zW@m_sTM9R`8$YymxwDe%pEHm%kTZ}okTZ}okTZ}okTY;uF%WgHG#-J*S8A=(nEeX<
zJ$-+d{=TH&J6oRXulZZfK+ZtUK+ZtUK+ZtUK+ZtUK+ZtUK+ZtUK+eEBkO9jv42toe
zrGNPSKaKzY{Q<-H8Sok45nvzi+WQUTr@&7D2}}SlU2hnV0iOo?z$Ea}`wZg(@Feg_
z;2Pk~_Zr3<!0W(Yf!_l!0FMG^fJxw=*Wo$vci?5<IpA5~`@mO#^MC*xfCF#7$1r{j
zJO+5cUBE|xSFbgUUjWYmPXZ4D=Yhk(AFnZtXMhX9SAi#h&jSwv=YdneQD72y`D(-X
z9`FUA4XguI;3U9-D}dMDZ5Y1-o(6sZJPtepbb$MSQ@~!}2H;Oufji)9zy`np6Sx)l
z3lc0Z0>1%12iyl70X_!&1Id}^fhT|_a0l=~;04UtbAXyVgW>g%`cI#>zWBO`R^q4|
zM~kj6LbG9o=Xg?ZkLx@9c(qn3Hzp1lTPvpDd0)DbD0!Yav9pYfeY3LB6?VkyYvppK
zUf)Hy<$4$hE`x9>!oceZvrtyIHwqKG)C#)lR)|@cy6?EO`o~>s-4DXZwZp<LwQSD{
z!>$#z%^;3;k;7BRmD>yXqR;N8+bP7I88x$J7Tqv9T#qEKpd4jhu+EMQD2kfg5xA`)
z7L>MVKhw6v)v%y$M*H+M^MgKfTdXgb6rG?an3iKvTS&qBuII6)V3yAW-G5=tIAZG7
z48wJu*mKZ8#B6DWZDTNuP(*Rp)cy1V*I{(|X2}id+RVuP8FK>t$e<sx%7!fz+3bAM
zP-b0YRPZ6<crvljyamf5#uD8z(-RY%Ok_x3NZC?YkvQ&3m`xyE*aXc{MhU*LBdlqK
zBBKsvg&`5NqRexovmz++gSxbf%*Ovw@$pV+cv+|THr6T1hC5w_IjLbmkUodB#>@gI
znE~-kzY2vy)_7W&5t^1THqV;lg33-<855BSCZEvmpe(UKrR<OerZp~k1YPO&Fd^(1
zUAkhWfni%ajcYzNkhCj$PljANTsg|lKQzwAF?C0*W!W%q>IO2ywdwP*h9!y7#_83{
zr`GC~Y`vwDZl@c_#P~VgBjYsT$+a<_R30C)t`m}&t=7$0)ru!N!jIH#vb6K@hPGi|
z+nXj|Ei=9Fc3e}+h+xf0`|2CaOdC+fNyKTr5>ttKt1_^KTD&8RNl9(Lsxt+4zdy%l
zvC;b8T`cXk8#g`hsOeNHcP!U86I<k*GfZN*^PbYc)xY^*gGEi<tuCPUb=%tbcfIvT
z7C2-L8(du`<k{(PX!NnNmQH}Jna7dqaXsbOsBm*}XIZ+6$jL62T-thf7Q~iMCZuF_
z+ZPwUs9-&ar7i9iGQ{P_E$t1Nes^FTydHOHi3le%9U6XkNtJ6s>^l{|=gPn*Z7!)&
zsToGnvLkJwMA9(z3Eg!u+E`Lb$LL5O+;;<YnsBwh?(!__geJZjY+(Jv!I>OXNsCcp
zu*qp4-9#9}T~uzvyl_IxX?);e>}vy3=PD<QrW(g!F)^H$i`THauBza<O=-zZHgdTY
zg=qmkD!DN3bVx2+bPJa2#W?O=pJ5XmIii^rMV8&h$<4?h)iI|p%c{nj@jBbTckjLf
z2lnHA-^~7*8C6bOh%r4mAmD)*1$4!h(_?rNJvVeC*6;UufGP9@u|lrMW)Ndb5Dv2(
z$E6yUhjFz6*-=+?scPGTqhk4+)Y7Uaa9A@t@G;DYt*Ew&?2efk{TaulJlD52i>xM`
zeh@gU-VWdd7FoH(4%|L-=N)XVUP4pUTGh8XD$lY7Y5C_o@KKM7Y{6~e^j+|RKo;3N
z9KgUYvZWH6nVX%RnVQ`@GfPb<#pamh1>mahqDItqL)H)ExkIEFw$mb0o&$>l@~_Z|
z5Ud`wqP_+47ia}29g8%S)8Ik-SV~`bEW+&(FHp9-$%2+@<HYhBJ0W}_LDOooKQ6kq
z@WDwhS-V;_%O<n4d>2iqf!WxRCe)y{Ae&>LnRUPpb3_E22$`vSgCZ_&KF1DfgB2S6
zVzpdZu2&d&U?{L68udc8u?$a~Ev(d7iLI7ujcR#qu~cKLYqiytdWADqhtgDk=aExG
zrRCG?RH;@gEjLadQgo7QCVC?29Q&_Fnt(aXRHW!ws?^FSAzzxWE>;_-VJXy5gC>D=
zWq5b6>ZJ=OHdCV=z^ZBZjLcE{yKyL5u~$^??x||y<jPt@)2Pmgu#Ni7O{K<8lc<=*
zj0&m5u+?|MOP@5%Mc{idS}Pn=qD5vCYO^_{7K{xCU5ZRQ(#7(fX*HdW+uB5dR^a#w
zTV83f(qf}hW0<8{WohN!3M;Ryo~~6-oNUlj%xs;WHBMGBmDR-xJ6S0muhf)IWmund
z*V_>@?FlwFGk1HDmAr1-YKn+0E|xjIc}z)!7*r@Etd`SWK=J=uh$Zhq3`+6;lFm{5
z8u9)G;EO;F_yq7_;6~sL#Qm=WuK*7N4zK|12VO<|{}dpB1~3I&4ZMIHz?Xr;00(Xa
zC@1h5@CShM0Y3!30bBq+3p9Zvz)ir5i1)t(M8FB)7T^`c`Y!`d1K$N!fsX=zMx6g`
z;OoFsz#-r!;CG1We+&E)_!00WU>%qR{)Jfn=fIP|2Cxsf6ZklA74R(`%l{2LJr8^n
zI1AK)C4l(58^~Wd1D7cSNwkv1EZHY=wNz3;1r~$6f>{tMSA>ll2MJPBDs$1IGxs1X
zu-hn=G8B^Iyf$x6YpkdWTs#n4UTBiw#5U1!>f;q=lU&Jg_?|vX-wRVXk`gD7!!Hn=
z+-TlGlx3|8c@Ss3SvpMqU=lAT0nX70cs}8<2gc5vEx=j0$m=%fXAZjSxS^fof)Z~R
z-E&PtX=0bw3iC;=gH!m+Mvt@*$LSOC#82cZYRTe*@L&?!!*9Y_R?PAT>6pn6=RwOH
zXfaAU!rQ@<v`YH^KTk6*l&Xv4iGjgzbSM<a(4?4l5R{m^r5Ka^6~gc=-}HZ)m`rk!
zgV}l;$;e%jiz&%(BV`FcNO@pGMhU0fzco^c%^uubtLcf%%-%s;329BMcX;S$RI2Rk
zf4RG)`L^x%m`hluJxj88@KU|_F9MhOYTf2%gu&9?K7pTQb@a}LoWLa|@JAPv#IFO=
zXDuA1BFht!rMFxeQbKT>N25)U@J=tBWt1sEfM>Rf3=wxk$3!;vB$*asPaZn$cWSJ#
z2NCcdWE98F-96#i@kO$=nJgp7)$d-2tSUPn*YE+5r(Q~Yfb2Zn+9;``h2%Crk7=`3
zzqIs>t(CKMqDsBCxD`@SnqW=EDGgxK3U9H4Y$RO?pFwy|SoKXfErVQ<aI}!(b&GGL
zAK^zJ%<ahVR0B!!at(=5RHhOdkgj7E=C|&1<Cd_qK`AFrS=F$=rZc@w<n9E*W<4Sk
zX~M&IVM~jI?}Th<5J!i%Uu2QCBr2KI1;c$DTR~1my3WwClJ=Kcc_d@l|6qnj_0l?x
z<Y3_nQc`V@WgVV0t<#7+rSb;CBTuku&ks7zhDx)q8`3HEBpa@mJ8U9lXDsik+dDSs
QFI#ZLWM~#9@r&ty03}TnyZ`_I

literal 0
HcmV?d00001

diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/CompletionErrorOnEnclosingType.java b/test/langtools/tools/javac/annotations/typeAnnotations/CompletionErrorOnEnclosingType.java
index cc6e48bb85d..f797787495a 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/CompletionErrorOnEnclosingType.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/CompletionErrorOnEnclosingType.java
@@ -36,6 +36,17 @@ import toolbox.Task.*;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Set;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+import javax.tools.Diagnostic;
 
 public class CompletionErrorOnEnclosingType {
     ToolBox tb = new ToolBox();
@@ -43,9 +54,13 @@ public class CompletionErrorOnEnclosingType {
     public static void main(String... args) throws Exception {
         CompletionErrorOnEnclosingType t = new CompletionErrorOnEnclosingType();
         t.testMissingEnclosingType();
+        t.testAnnotationProcessing();
     }
 
-    void testMissingEnclosingType() throws Exception {
+    Path src;
+    Path out;
+
+    void setup() throws Exception {
         String annoSrc =
                 """
                 import static java.lang.annotation.ElementType.TYPE_USE;
@@ -67,12 +82,16 @@ public class CompletionErrorOnEnclosingType {
                 """;
 
         Path base = Paths.get(".");
-        Path src = base.resolve("src");
+        src = base.resolve("src");
         tb.createDirectories(src);
         tb.writeJavaFiles(src, annoSrc, cSrc);
-        Path out = base.resolve("out");
+        out = base.resolve("out");
         tb.createDirectories(out);
         new JavacTask(tb).outdir(out).files(tb.findJavaFiles(src)).run();
+    }
+
+    void testMissingEnclosingType() throws Exception {
+        setup();
 
         // now if we remove A.class there will be an error but javac should not crash
         tb.deleteFiles(out.resolve("A.class"));
@@ -85,14 +104,80 @@ public class CompletionErrorOnEnclosingType {
                         .run(Expect.SUCCESS)
                         .writeAll()
                         .getOutputLines(Task.OutputKind.DIRECT);
+    }
+
+    @SupportedAnnotationTypes("*")
+    public static class Processor extends AbstractProcessor {
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latestSupported();
+        }
+
+        boolean first = true;
+
+        @Override
+        public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+            if (!first) {
+                return false;
+            }
+            Element te = processingEnv.getElementUtils().getTypeElement("B");
+            for (var f : ElementFilter.fieldsIn(te.getEnclosedElements())) {
+                TypeMirror t = f.asType();
+                processingEnv
+                        .getMessager()
+                        .printMessage(
+                                Diagnostic.Kind.NOTE,
+                                "%s (%s) has annotations [%s]"
+                                        .formatted(f, t, t.getAnnotationMirrors()));
+            }
+            first = false;
+            return false;
+        }
+    }
+
+    void testAnnotationProcessing() throws Exception {
+        setup();
+
+        List<String> log =
+                new JavacTask(tb)
+                        .outdir(out)
+                        .classpath(out)
+                        .options("-XDrawDiagnostics")
+                        .files(src.resolve("C.java"))
+                        .processors(new Processor())
+                        .run(Expect.SUCCESS)
+                        .writeAll()
+                        .getOutputLines(Task.OutputKind.DIRECT);
 
         var expectedOutput =
+                List.of(
+                        "- compiler.note.proc.messager: a (@Anno A<java.lang.String>) has"
+                            + " annotations [@Anno]");
+        if (!expectedOutput.equals(log)) {
+            throw new Exception("expected output not found: " + log);
+        }
+
+        // now if we remove A.class there will be an error and the annotations won't be available
+        // but javac should not crash
+        tb.deleteFiles(out.resolve("A.class"));
+
+        log =
+                new JavacTask(tb)
+                        .outdir(out)
+                        .classpath(out)
+                        .options("-XDrawDiagnostics")
+                        .files(src.resolve("C.java"))
+                        .processors(new Processor())
+                        .run(Expect.FAIL)
+                        .writeAll()
+                        .getOutputLines(Task.OutputKind.DIRECT);
+
+        expectedOutput =
                 List.of(
                         "B.class:-:-: compiler.err.cant.attach.type.annotations: @Anno, B, a,"
-                            + " (compiler.misc.class.file.not.found: A)",
+                                + " (compiler.misc.class.file.not.found: A)",
+                        "- compiler.note.proc.messager: a (A<java.lang.String>) has annotations []",
                         "1 error");
-        // FIXME
-        expectedOutput = List.of("");
         if (!expectedOutput.equals(log)) {
             throw new Exception("expected output not found: " + log);
         }