8329951: var emits deprecation warnings that do not point to the file or position

Reviewed-by: vromero

Author: archiecobbs

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java

@@ -365,10 +365,6 @@ abstract class RedundantLocalVarTypeAnalyzerBase<X extends JCStatement> extends
             super(AnalyzerMode.LOCAL, tag);
         }
 
-        boolean isImplicitlyTyped(JCVariableDecl decl) {
-            return decl.vartype.pos == Position.NOPOS;
-        }
-
         /**
          * Map a variable tree into a new declaration using implicit type.
          */
@@ -401,7 +397,7 @@ class RedundantLocalVarTypeAnalyzer extends RedundantLocalVarTypeAnalyzerBase<JC
 
         boolean match(JCVariableDecl tree){
             return tree.sym.owner.kind == Kind.MTH &&
-                    tree.init != null && !isImplicitlyTyped(tree) &&
+                    tree.init != null && !tree.declaredUsingVar() &&
                     attr.canInferLocalVarType(tree) == null;
         }
         @Override
@@ -425,7 +421,7 @@ class RedundantLocalVarTypeAnalyzerForEach extends RedundantLocalVarTypeAnalyzer
 
         @Override
         boolean match(JCEnhancedForLoop tree){
-            return !isImplicitlyTyped(tree.var);
+            return !tree.var.declaredUsingVar();
         }
         @Override
         List<JCEnhancedForLoop> rewrite(JCEnhancedForLoop oldTree) {

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java

@@ -5716,9 +5716,9 @@ private Type capture(Type type) {
 
     private void setSyntheticVariableType(JCVariableDecl tree, Type type) {
         if (type.isErroneous()) {
-            tree.vartype = make.at(Position.NOPOS).Erroneous();
+            tree.vartype = make.at(tree.pos()).Erroneous();
         } else {
-            tree.vartype = make.at(Position.NOPOS).Type(type);
+            tree.vartype = make.at(tree.pos()).Type(type);
         }
     }
 

test/langtools/tools/javac/tree/VarWarnPosition.java

@@ -0,0 +1,29 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8329951
+ * @summary Check that "var" variable synthetic types have a source position
+ * @compile/process/ref=VarWarnPosition.out -Xlint:deprecation -XDrawDiagnostics VarWarnPosition.java
+ */
+
+import java.util.*;
+import java.util.function.*;
+
+public class VarWarnPosition {
+
+    VarWarnPosition() {
+
+        // Test 1
+        @SuppressWarnings("deprecation")
+        List<Depr> deprecatedList = null;
+        for (var deprValue : deprecatedList) { }
+
+        // Test 2
+        Consumer<Depr> c = d -> { };
+
+        // Test 3
+        Consumer<Depr> c2 = (var d) -> { };
+    }
+}
+
+@Deprecated
+class Depr {}

test/langtools/tools/javac/tree/VarWarnPosition.out

@@ -0,0 +1,6 @@
+VarWarnPosition.java:18:14: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+VarWarnPosition.java:21:18: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+VarWarnPosition.java:21:28: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+VarWarnPosition.java:24:18: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+VarWarnPosition.java:24:30: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+5 warnings