Check @deprecated annotation in method Attr.checkIdInternal. Remove the redundant warning code

Author: lgxbslgx

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

@@ -4459,15 +4459,10 @@ else if (ownOuter.hasTag(CLASS) && site != ownOuter) {
             }
 
             // Emit a `deprecation' warning if symbol is deprecated.
-            // (for constructors (but not for constructor references), the error
-            // was given when the constructor was resolved)
-
-            if (sym.name != names.init || tree.hasTag(REFERENCE)) {
-                chk.checkDeprecated(tree.pos(), env.info.scope.owner, sym);
-                chk.checkSunAPI(tree.pos(), sym);
-                chk.checkProfile(tree.pos(), sym);
-                chk.checkPreview(tree.pos(), sym);
-            }
+            chk.checkDeprecated(tree.pos(), env.info.scope.owner, sym);
+            chk.checkSunAPI(tree.pos(), sym);
+            chk.checkProfile(tree.pos(), sym);
+            chk.checkPreview(tree.pos(), sym);
 
             // If symbol is a variable, check that its type and
             // kind are compatible with the prototype and protokind.

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

@@ -2855,13 +2855,8 @@ Symbol findConstructor(DiagnosticPosition pos, Env<AttrContext> env,
                               List<Type> typeargtypes,
                               boolean allowBoxing,
                               boolean useVarargs) {
-        Symbol sym = findMethod(env, site,
-                                    names.init, argtypes,
-                                    typeargtypes, allowBoxing,
-                                    useVarargs);
-        chk.checkDeprecated(pos, env.info.scope.owner, sym);
-        chk.checkPreview(pos, sym);
-        return sym;
+        return findMethod(env, site, names.init, argtypes,
+                            typeargtypes, allowBoxing, useVarargs);
     }
 
     /** Resolve constructor using diamond inference.
@@ -2883,7 +2878,7 @@ Symbol resolveDiamond(DiagnosticPosition pos,
                 new BasicLookupHelper(names.init, site, argtypes, typeargtypes) {
                     @Override
                     Symbol doLookup(Env<AttrContext> env, MethodResolutionPhase phase) {
-                        return findDiamond(pos, env, site, argtypes, typeargtypes,
+                        return findDiamond(env, site, argtypes, typeargtypes,
                                 phase.isBoxingRequired(),
                                 phase.isVarargsRequired());
                     }
@@ -2906,29 +2901,6 @@ Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Sym
                     }});
     }
 
-    /** 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,