--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Oct 27 14:25:59 2008 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue Oct 28 14:05:59 2008 +0000
@@ -706,13 +706,13 @@
             }
         }
 
-        // Check that the variable's declared type is well-formed.
-        chk.validate(tree.vartype, env);
-
         VarSymbol v = tree.sym;
         Lint lint = env.info.lint.augment(v.attributes_field, v.flags());
         Lint prevLint = chk.setLint(lint);
 
+        // Check that the variable's declared type is well-formed.
+        chk.validate(tree.vartype, env);
+
         try {
             chk.checkDeprecatedAnnotation(tree.pos(), v);
 

--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Mon Oct 27 14:25:59 2008 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Tue Oct 28 14:05:59 2008 +0000
@@ -774,7 +774,7 @@
     Cannot find annotation method ''{1}()'' in type ''{0}'': {2}
 
 compiler.warn.raw.class.use=\
-    [raw-type] found raw type: {0}\n\
+    [rawtypes] found raw type: {0}\n\
     missing type parameters for generic class {1}
 
 #####

--- a/langtools/test/tools/javac/6304921/T6304921.out	Mon Oct 27 14:25:59 2008 -0700
+++ b/langtools/test/tools/javac/6304921/T6304921.out	Tue Oct 28 14:05:59 2008 +0000
@@ -1,4 +1,4 @@
-T6304921.java:671/671/680: warning: [raw-type] found raw type: java.util.ArrayList
+T6304921.java:671/671/680: warning: [rawtypes] found raw type: java.util.ArrayList
 missing type parameters for generic class java.util.ArrayList<E>
         List<Integer> list = new ArrayList();
                                  ^

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/warnings/T6763518.java	Tue Oct 28 14:05:59 2008 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008 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 6763518
+ * @summary Impossible to suppress raw-type warnings
+ * @compile -Werror -Xlint:rawtypes T6763518.java
+ */
+
+import java.util.List;
+
+class T6763518 {
+    @SuppressWarnings("rawtypes")
+    List l1;
+
+    void m(@SuppressWarnings("rawtypes") List l2) {
+        @SuppressWarnings("rawtypes")
+        List l3;
+    };
+}