changeset 571:1d587ef8bf56

6951833: latest diamond implementation generates spurious raw type warnings Summary: Raw warning checks should be disabled in the presence of a diamond AST node Reviewed-by: jjg
author mcimadamore
date Wed, 19 May 2010 16:43:30 +0100
parents eb849389ae2c
children e9d66d392a8d
files src/share/classes/com/sun/tools/javac/comp/Check.java test/tools/javac/generics/diamond/T6951833.java
diffstat 2 files changed, 37 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Wed May 19 16:43:06 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Wed May 19 16:43:30 2010 +0100
@@ -886,6 +886,7 @@
     void checkRaw(JCTree tree, Env<AttrContext> env) {
         if (lint.isEnabled(Lint.LintCategory.RAW) &&
             tree.type.tag == CLASS &&
+            !TreeInfo.isDiamond(tree) &&
             !env.enclClass.name.isEmpty() &&  //anonymous or intersection
             tree.type.isRaw()) {
             log.warning(tree.pos(), "raw.class.use", tree.type, tree.type.tsym.type);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/generics/diamond/T6951833.java	Wed May 19 16:43:30 2010 +0100
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6951833
+ *
+ * @summary  latest diamond implementation generates spurious raw type warnings
+ * @author mcimadamore
+ * @compile -Xlint:rawtypes -Werror T6951833.java
+ *
+ */
+
+class T6951833<X> {
+   T6951833<String> bug = new T6951833<>();
+}