8257037: No javac warning when calling deprecated constructor with diamond

Author: lgxbslgx

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

@@ -2883,7 +2883,7 @@ Symbol resolveDiamond(DiagnosticPosition pos,
                 new BasicLookupHelper(names.init, site, argtypes, typeargtypes) {
                     @Override
                     Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
-                        return findDiamond(env, site, argtypes, typeargtypes,
+                        return findDiamond(pos, env, site, argtypes, typeargtypes,
                                 phase.isBoxingRequired(),
                                 phase.isVarargsRequired());
                     }
@@ -2896,23 +2896,50 @@ Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Sym
                             } else {
                                 final JCDiagnostic details = sym.kind == WRONG_MTH ?
                                                 ((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd :
-                                                null;
+                                        null;
                                 sym = new DiamondError(sym, currentResolutionContext);
                                 sym = accessMethod(sym, pos, site, names.init, true, argtypes, typeargtypes);
                                 env.info.pendingResolutionPhase = currentResolutionContext.step;
                             }
                         }
                         return sym;
-                    }});
+                    }
+                });
     }
 
-    /** This method scans all the constructor symbol in a given class scope -
-     *  assuming that the original scope contains a constructor of the kind:
-     *  {@code Foo(X x, Y y)}, where X,Y are class type-variables declared in Foo,
-     *  a method check is executed against the modified constructor type:
-     *  {@code <X,Y>Foo<X,Y>(X x, Y y)}. This is crucial in order to enable diamond
-     *  inference. The inferred return type of the synthetic constructor IS
-     *  the inferred type for the diamond operator.
+    /**
+     * Find the constructor using diamond inference and do some checks(deprecated and preview).
+     *
+     * @param pos          The position to use for error reporting.
+     * @param env          The environment current at the constructor invocation.
+     * @param site         The type of class for which a constructor is searched.
+     *                     The scope of this class has been touched in attribution.
+     * @param argtypes     The types of the constructor invocation's value arguments.
+     * @param typeargtypes The types of the constructor invocation's type arguments.
+     * @param allowBoxing  Allow boxing conversions of arguments.
+     * @param useVarargs   Box trailing arguments into an array for varargs.
+     */
+    private Symbol findDiamond(DiagnosticPosition pos,
+                               Env<AttrContext> env,
+                               Type site,
+                               List<Type> argtypes,
+                               List<Type> typeargtypes,
+                               boolean allowBoxing,
+                               boolean useVarargs) {
+        Symbol sym = findDiamond(env, site, argtypes, typeargtypes, allowBoxing, useVarargs);
+        chk.checkDeprecated(pos, env.info.scope.owner, sym);
+        chk.checkPreview(pos, sym);
+        return sym;
+    }
+
+    /**
+     * This method scans all the constructor symbol in a given class scope -
+     * assuming that the original scope contains a constructor of the kind:
+     * {@code Foo(X x, Y y)}, where X,Y are class type-variables declared in Foo,
+     * a method check is executed against the modified constructor type:
+     * {@code <X,Y>Foo<X,Y>(X x, Y y)}. This is crucial in order to enable diamond
+     * inference. The inferred return type of the synthetic constructor IS
+     * the inferred type for the diamond operator.
      */
     private Symbol findDiamond(Env<AttrContext> env,
                               Type site,

test/langtools/tools/javac/T8257037/T8257037.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2020, 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 8257307
+ * @summary No javac warning when calling deprecated constructor with diamond
+ * @run compile/ref=T8257037.out -Xlint -XDrawDiagnostics T8257037.java
+ */
+
+public class T8257037 {
+    T8257037_GenericClass<Object> test = new T8257037_GenericClass<>(); // use diamond
+}
+
+class T8257037_GenericClass<T> {
+    @Deprecated
+    public T8257037_GenericClass() {}
+}

test/langtools/tools/javac/T8257037/T8257037.out

@@ -0,0 +1,2 @@
+T8257037.java:32:42: compiler.warn.has.been.deprecated: <T>T8257037_GenericClass(), T8257037_GenericClass
+1 warning