changeset 2779:6d3e36e420df

8043741: VerifyError due to missing checkcast Summary: Proto-type is not set correctly for NULLCHK synthetic trees Reviewed-by: mcimadamore Contributed-by: srikanth.adayapalam@oracle.com
author mcimadamore
date Fri, 09 Jan 2015 15:49:42 +0000
parents 6a927a9114c1
children 7dfe06818a80
files src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java test/tools/javac/generics/MissingCast2.java
diffstat 2 files changed, 58 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java	Fri Jan 09 15:48:09 2015 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java	Fri Jan 09 15:49:42 2015 +0000
@@ -739,7 +739,9 @@
     }
 
     public void visitUnary(JCUnary tree) {
-        tree.arg = translate(tree.arg, tree.operator.type.getParameterTypes().head);
+        tree.arg = translate(tree.arg, (tree.getTag() == Tag.NULLCHK)
+            ? tree.type
+            : tree.operator.type.getParameterTypes().head);
         result = tree;
     }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/generics/MissingCast2.java	Fri Jan 09 15:49:42 2015 +0000
@@ -0,0 +1,55 @@
+/*
+ * 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 8043741
+ * @summary VerifyError due to missing checkcast
+ * @author srikanth
+ *
+ * @compile  MissingCast2.java
+ * @run main MissingCast2
+ */
+
+import java.util.*;
+
+public class MissingCast2 {
+  public static void main(String[] args) {
+          new E();
+  }
+}
+
+class S<T> {
+    T t;
+}
+
+class C {
+    class I { };
+}
+
+class E extends S<C> {
+    {
+        t = new C();
+        t.new I() { };
+    }
+};