stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8036142: Remove redundant call to annotateTypeLater with null Symbol

Browse Source 
AnnotateTypeLater (formerly typeAnnotate) with null as the symbol was a way to force attribution of type annotations, but this is now obsolete and problematic, and a silent noop condition

Reviewed-by: jjg
This commit is contained in:
Eric McCorkle 2014-03-03 16:17:32 -05:00
parent 74250736aa
commit 6b9060ac8f
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java
View File

@ -842,7 +842,7 @@ public class Annotate {
final Env<AttrContext> env, final Env<AttrContext> env,
final Symbol sym, final Symbol sym,
final DiagnosticPosition deferPos) { final DiagnosticPosition deferPos) {
Assert.checkNonNull(sym);
normal(new Annotate.Worker() { normal(new Annotate.Worker() {
@Override @Override
public String toString() { public String toString() {

7
langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -769,13 +769,6 @@ public class Attr extends JCTree.Visitor {
= deferredLintHandler.setPos(variable.pos()); = deferredLintHandler.setPos(variable.pos());
try { try {
// Use null as symbol to not attach the type annotation to any symbol.
// The initializer will later also be visited and then we'll attach
// to the symbol.
// This prevents having multiple type annotations, just because of
// lazy constant value evaluation.
annotate.annotateTypeLater(variable.init, env, null, variable.pos());
annotate.flush();
Type itype = attribExpr(variable.init, env, type); Type itype = attribExpr(variable.init, env, type);
if (itype.constValue() != null) { if (itype.constValue() != null) {
return coerce(itype, type).constValue(); return coerce(itype, type).constValue();