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

8054448: (ann) Cannot reference field of inner class in an anonymous class

Browse Source 
Reviewed-by: jlahoda, mcimadamore
This commit is contained in:
Joel Borggrén-Franck 2014-10-24 08:34:51 +02:00
parent 535317c6f8
commit 0149333fb8
3 changed files with 339 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -989,8 +989,12 @@ public class Attr extends JCTree.Visitor {
// parameters have already been entered
env.info.scope.enter(tree.sym);
} else {
try {
annotate.enterStart();
memberEnter.memberEnter(tree, env);
annotate.flush();
} finally {
annotate.enterDone();
}
}
} else {
if (tree.init != null) {

17
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
View File

@ -518,9 +518,6 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
}
Env<AttrContext> localEnv = methodEnv(tree, env);
annotate.enterStart();
try {
DiagnosticPosition prevLintPos = deferredLintHandler.setPos(tree.pos());
try {
// Compute the method type
@ -561,9 +558,6 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
if (tree.defaultValue != null)
annotateDefaultValueLater(tree.defaultValue, localEnv, m);
} finally {
annotate.enterDone();
}
}
/** Create a fresh environment for method bodies.
@ -591,8 +585,6 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
localEnv.info.staticLevel++;
}
DiagnosticPosition prevLintPos = deferredLintHandler.setPos(tree.pos());
annotate.enterStart();
try {
try {
if (TreeInfo.isEnumInit(tree)) {
attr.attribIdentAsEnumType(localEnv, (JCIdent)tree.vartype);
@ -638,9 +630,6 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
annotate.annotateTypeLater(tree.vartype, localEnv, v, tree.pos());
v.pos = tree.pos;
} finally {
annotate.enterDone();
}
}
// where
void checkType(JCTree tree, Type type, String diag) {
@ -866,6 +855,9 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
return;
}
try {
annotate.enterStart();
ClassSymbol c = (ClassSymbol)sym;
ClassType ct = (ClassType)c.type;
Env<AttrContext> env = typeEnvs.get(c);
@ -1080,6 +1072,9 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
}
}
} finally {
annotate.enterDone();
}
}
private Env<AttrContext> baseEnv(JCClassDecl tree, Env<AttrContext> env) {

46
langtools/test/tools/javac/annotations/FinalStringInNested.java Normal file
View File

@ -0,0 +1,46 @@
/*
* Copyright (c) 2014, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8054448
* @summary Verify that constant strings in nested classes in anonymous classes
* can be used in annotations.
* @compile FinalStringInNested.java
*/
public class FinalStringInNested {
public void f() {
Object o = new Object() {
@FinalStringInNested.Annotation(Nested.ID)
class Nested {
static final String ID = "B";
}
};
}
@interface Annotation {
String value();
}
}