changeset 823:9359f4222545

6956758: NPE in com.sun.tools.javac.code.Symbol - isSubClass Summary: Use of TransTypes.cast() instead of TransTypes.coerce() causes NPE in Lower Reviewed-by: jjg
author mcimadamore
date Fri, 03 Dec 2010 16:31:23 +0000
parents 28566c763dad
children aa6605d883dc
files src/share/classes/com/sun/tools/javac/comp/TransTypes.java test/tools/javac/generics/6956758/T6956758neg.java test/tools/javac/generics/6956758/T6956758neg.out test/tools/javac/generics/6956758/T6956758pos.java
diffstat 4 files changed, 68 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Thu Dec 02 16:38:16 2010 -0800
+++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Fri Dec 03 16:31:23 2010 +0000
@@ -719,7 +719,7 @@
                 tree.sym = ((MethodSymbol)tree.sym).
                     implemented((TypeSymbol)tree.sym.owner, types);
             }
-            tree.selected = cast(
+            tree.selected = coerce(
                 translate(tree.selected, erasure(tree.selected.type)),
                 erasure(tree.sym.owner.type));
         } else
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/generics/6956758/T6956758neg.java	Fri Dec 03 16:31:23 2010 +0000
@@ -0,0 +1,20 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6956758
+ *
+ * @summary  NPE in com.sun.tools.javac.code.Symbol - isSubClass
+ * @author Maurizio Cimadamore
+ * @compile/fail/ref=T6956758neg.out -XDrawDiagnostics T6956758neg.java
+ *
+ */
+
+class T6956758neg {
+
+    interface I {}
+
+    static class C {
+        <T extends Object & I> T cloneObject(T object) throws Exception {
+            return (T)object.clone();
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/generics/6956758/T6956758neg.out	Fri Dec 03 16:31:23 2010 +0000
@@ -0,0 +1,4 @@
+T6956758neg.java:17:29: compiler.err.report.access: clone(), protected, java.lang.Object
+- compiler.note.unchecked.filename: T6956758neg.java
+- compiler.note.unchecked.recompile
+1 error
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/generics/6956758/T6956758pos.java	Fri Dec 03 16:31:23 2010 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 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 6956758
+ *
+ * @summary  NPE in com.sun.tools.javac.code.Symbol - isSubClass
+ * @author Maurizio Cimadamore
+ * @compile T6956758pos.java
+ *
+ */
+
+class T6956758pos {
+
+    interface I {}
+
+    static class C {
+        <T extends C & I> T cloneObject(T object) throws Exception {
+            return (T)object.clone();
+        }
+    }
+}