infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8374379: Type annotation in new array dimension expression causes java.lang.AssertionError

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Jan Lahoda 2026-01-13 08:12:35 +00:00
parent d6f43d7329
commit 578204f8c4
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2026, 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
@ -1403,6 +1403,7 @@ public class TypeAnnotations {
break;
}
}
scan(tree.dims);
scan(tree.elems);
}

3
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2026, 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
@ -1107,6 +1107,7 @@ public class Annotate {
for (List<JCAnnotation> dimAnnos : tree.dimAnnotations)
enterTypeAnnotations(dimAnnos, env, sym, false);
scan(tree.elemtype);
scan(tree.dims);
scan(tree.elems);
}

22
test/langtools/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2026, 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
@ -44,7 +44,8 @@ public class TestNewCastArray {
// 'b' tests fail with only even numbers of annotations (8005681).
String[] testclasses = {"Test1",
"Test2a", "Test3a", "Test4a", "Test5a",
"Test2b", "Test3b", "Test4b", "Test5b"
"Test2b", "Test3b", "Test4b", "Test5b",
"Test6a"
};
public static void main(String[] args) throws Exception {
@ -182,6 +183,11 @@ public class TestNewCastArray {
case "ci2": expected = 0; break;
case "ci22": expected = 0; break;
case "Test6a<init>": cexpected=4; break;
case "test6aPrimitiveArray": expected = 0; break;
case "test6aRefArray": expected = 0; break;
case "test6aMethod": cexpected = 4; break;
default: expected = 0; break;
}
if(codeattr)
@ -353,6 +359,18 @@ public class TestNewCastArray {
Integer ci22 = (@A @A @B @B Integer)o; // FAIL expect 3, got 1
}
static class Test6a {
Test6a(){}
long l = 0;
// Cast expressions inside new array dimensions:
int[] test6aPrimitiveArray = new int[(@A @A @B @B int) l];
Integer[] test6aRefArray = new Integer[(@A @A @B @B int) l];
private void test6aMethod() {
int[] primitiveArray = new int[(@A @A @B @B int) l];
Integer[] refArray = new Integer[(@A @A @B @B int) l];
}
}
@Retention(RUNTIME) @Target({TYPE_USE}) @Repeatable( AC.class ) @interface A { }
@Retention(RUNTIME) @Target({TYPE_USE}) @Repeatable( BC.class ) @interface B { }
@Retention(RUNTIME) @Target({FIELD}) @Repeatable( FC.class ) @interface F { }