Skip to content

8360406: [21u] Disable logic for attaching type annotations to class files until 8359336 is fixed #4152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: pr/4151
Choose a base branch
from
Open

8360406: [21u] Disable logic for attaching type annotations to class files until 8359336 is fixed #4152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ public class ClassReader {
*/
public boolean saveParameterNames;

private final boolean addTypeAnnotationsToSymbol;

/**
* The currently selected profile.
*/
Expand Down Expand Up @@ -291,6 +293,8 @@ protected ClassReader(Context context) {

lintClassfile = Lint.instance(context).isEnabled(LintCategory.CLASSFILE);

addTypeAnnotationsToSymbol = options.getBoolean("addTypeAnnotationsToSymbol", false);

initAttributeReaders();
}

Expand Down Expand Up @@ -2188,7 +2192,9 @@ public void run() {
currentClassFile = classFile;
List<Attribute.TypeCompound> newList = deproxyTypeCompoundList(proxies);
sym.setTypeAttributes(newList.prependList(sym.getRawTypeAttributes()));
addTypeAnnotationsToSymbol(sym, newList);
if (addTypeAnnotationsToSymbol) {
addTypeAnnotationsToSymbol(sym, newList);
}
} finally {
currentClassFile = previousClassFile;
}
Expand Down
2 changes: 1 addition & 1 deletion test/langtools/tools/javac/annotations/typeAnnotations/CompletionErrorOnEnclosingType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class C {
new JavacTask(tb)
.outdir(out)
.classpath(out)
.options("-XDrawDiagnostics")
.options("-XDrawDiagnostics", "-XDaddTypeAnnotationsToSymbol=true")
.files(src.resolve("C.java"))
.run(Expect.FAIL)
.writeAll()
Expand Down
2 changes: 1 addition & 1 deletion test/langtools/tools/javac/processing/model/type/BasicAnnoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* jdk.compiler/com.sun.tools.javac.util
* @build JavacTestingAbstractProcessor DPrinter BasicAnnoTests
* @compile/process -XDaccessInternalAPI -processor BasicAnnoTests -proc:only BasicAnnoTests.java
* @compile/process -XDaccessInternalAPI -processor BasicAnnoTests -proc:only BasicAnnoTests
* @compile/process -XDaccessInternalAPI -XDaddTypeAnnotationsToSymbol=true -processor BasicAnnoTests -proc:only BasicAnnoTests
*/

import java.io.PrintWriter;
Expand Down