Mercurial > hg > openjdk > icedtea > jdk7 > langtools
changeset 1241:1936504ce917
7151070: NullPointerException in Resolve.isAccessible
Summary: Spurious accessibility check in TransTypes
Reviewed-by: mcimadamore
| author | dmeetry |
|---|---|
| date | Fri, 25 May 2012 16:47:42 +0400 |
| parents | 63327fd6e6d3 |
| children | c2668fc629cc |
| files | src/share/classes/com/sun/tools/javac/comp/Resolve.java src/share/classes/com/sun/tools/javac/comp/TransTypes.java test/tools/javac/generics/7151070/T7151070.java test/tools/javac/generics/7151070/T7151070.out |
| diffstat | 4 files changed, 32 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java Tue May 22 20:19:21 2012 +0400 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java Fri May 25 16:47:42 2012 +0400 @@ -1807,9 +1807,10 @@ * ResolveError classes, indicating error situations when accessing symbols ****************************************************************************/ - public void logAccessError(Env<AttrContext> env, JCTree tree, Type type) { - AccessError error = new AccessError(env, type.getEnclosingType(), type.tsym); - logResolveError(error, tree.pos(), type.getEnclosingType().tsym, type.getEnclosingType(), null, null, null); + //used by TransTypes when checking target type of synthetic cast + public void logAccessErrorInternal(Env<AttrContext> env, JCTree tree, Type type) { + AccessError error = new AccessError(env, env.enclClass.type, type.tsym); + logResolveError(error, tree.pos(), env.enclClass.sym, env.enclClass.type, null, null, null); } //where private void logResolveError(ResolveError error,
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Tue May 22 20:19:21 2012 +0400 +++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Fri May 25 16:47:42 2012 +0400 @@ -107,7 +107,7 @@ make.at(tree.pos); if (!types.isSameType(tree.type, target)) { if (!resolve.isAccessible(env, target.tsym)) - resolve.logAccessError(env, tree, target); + resolve.logAccessErrorInternal(env, tree, target); tree = make.TypeCast(make.Type(target), tree).setType(target); } make.pos = oldpos;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/7151070/T7151070.java Fri May 25 16:47:42 2012 +0400 @@ -0,0 +1,25 @@ +/* + * @test /nodynamiccopyright/ + * @bug 7151070 + * @summary NullPointerException in Resolve.isAccessible + * @compile/fail/ref=T7151070.out -XDrawDiagnostics T7151070.java + */ + +class T7151070a { + private static class PrivateCls { } + public static class PublicCls extends PrivateCls { } + + public void m(PrivateCls p) { } +} + +class T7151070b { + public void test(Test<T7151070a.PublicCls> obj, T7151070a outer) { + outer.m(obj.get()); + } + + public static class Test<T> { + public T get() { + return null; + } + } +}