Incorrect warning for @SuppressWarnings for forRemoval deprecations in light of JEP 277 (#4595)

Inside deprecated code suppress only ordinary deprecation warnings

Some more clean-up after PR #4564:
+ remove distinction isDeprecated() vs. isViewedAsDeprecated()
+ remove obsolete dead branch regarding implicit deprecation

Let Deprecated9Test opt-in to run.javac mode

Improve test isolation

Fixes #4579

Author: stephan-herrmann

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/ASTNode.java

@@ -492,13 +492,16 @@ public final boolean isFieldUseDeprecated(FieldBinding field, Scope scope, int f
 			}
 		}
 
-		if (!field.isViewedAsDeprecated()) return false;
+		if (!field.isDeprecated()) return false;
 
 		// inside same outermost enclosing type - no report
 		if (scope.isDefinedInSameEnclosingType(field.declaringClass.outermostEnclosingType())) return false;
 
-		// if context is deprecated, may avoid reporting
-		if (!scope.compilerOptions().reportDeprecationInsideDeprecatedCode && scope.isInsideDeprecatedCode()) return false;
+		// if context is deprecated, may avoid reporting ordinary deprecation
+		if ((field.tagBits & TagBits.AnnotationTerminallyDeprecated) == 0
+				&& !scope.compilerOptions().reportDeprecationInsideDeprecatedCode
+				&& scope.isInsideDeprecatedCode())
+			return false;
 		return true;
 	}
 
@@ -542,19 +545,16 @@ public final boolean isMethodUseDeprecated(MethodBinding method, Scope scope,
 			}
 		}
 
-		if (!method.isViewedAsDeprecated()) return false;
+		if (!method.isDeprecated()) return false;
 
 		// inside same outermost enclosing type - no report
 		if (scope.isDefinedInSameEnclosingType(method.declaringClass.outermostEnclosingType())) return false;
 
-		// non explicit use and non explicitly deprecated - no report
-		if (!isExplicitUse &&
-				(method.modifiers & ClassFileConstants.AccDeprecated) == 0) {
+		// if context is deprecated, may avoid reporting ordinary deprecation
+		if ((method.tagBits & TagBits.AnnotationTerminallyDeprecated) == 0
+				&& !scope.compilerOptions().reportDeprecationInsideDeprecatedCode
+				&& scope.isInsideDeprecatedCode())
 			return false;
-		}
-
-		// if context is deprecated, may avoid reporting
-		if (!scope.compilerOptions().reportDeprecationInsideDeprecatedCode && scope.isInsideDeprecatedCode()) return false;
 		return true;
 	}
 
@@ -615,13 +615,16 @@ public final boolean isTypeUseDeprecated(TypeBinding type, Scope scope) {
 		// force annotations resolution before deciding whether the type may be deprecated
 		refType.initializeDeprecatedAnnotationTagBits();
 
-		if (!refType.isViewedAsDeprecated()) return false;
+		if (!refType.isDeprecated()) return false;
 
 		// inside same outermost enclosing type - no report
 		if (scope.isDefinedInSameEnclosingType(refType.outermostEnclosingType())) return false;
 
-		// if context is deprecated, may avoid reporting
-		if (!scope.compilerOptions().reportDeprecationInsideDeprecatedCode && scope.isInsideDeprecatedCode()) return false;
+		// if context is deprecated, may avoid reporting ordinary deprecation
+		if ((type.tagBits & TagBits.AnnotationTerminallyDeprecated) == 0
+				&& !scope.compilerOptions().reportDeprecationInsideDeprecatedCode
+				&& scope.isInsideDeprecatedCode())
+			return false;
 		return true;
 	}
 

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/FieldBinding.java

@@ -370,12 +370,6 @@ public final boolean isUsedOnlyInCompound() {
 /* Answer true if the receiver has protected visibility
 */
 
-public final boolean isViewedAsDeprecated() {
-	return (this.modifiers & ClassFileConstants.AccDeprecated) != 0;
-}
-/* Answer true if the receiver is a volatile field
-*/
-
 @Override
 public final boolean isVolatile() {
 	return (this.modifiers & ClassFileConstants.AccVolatile) != 0;

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java

@@ -981,12 +981,6 @@ public boolean isParameterizedGeneric() {
 public boolean isPolymorphic() {
 	return false;
 }
-/* Answer true if the receiver's declaring type is deprecated (or any of its enclosing types)
-*/
-public final boolean isViewedAsDeprecated() {
-	return (this.modifiers & ClassFileConstants.AccDeprecated) != 0;
-}
-
 @Override
 public final int kind() {
 	return Binding.METHOD;

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier.java

@@ -183,8 +183,8 @@ void checkAgainstInheritedMethods(MethodBinding currentMethod, MethodBinding[] m
 			if(inheritedMethod.isSynchronized() && !currentMethod.isSynchronized()) {
 				problemReporter(currentMethod).missingSynchronizedOnInheritedMethod(currentMethod, inheritedMethod);
 			}
-			if (options.reportDeprecationWhenOverridingDeprecatedMethod && inheritedMethod.isViewedAsDeprecated()) {
-				if (!currentMethod.isViewedAsDeprecated() || options.reportDeprecationInsideDeprecatedCode) {
+			if (options.reportDeprecationWhenOverridingDeprecatedMethod && inheritedMethod.isDeprecated()) {
+				if (!currentMethod.isDeprecated() || options.reportDeprecationInsideDeprecatedCode) {
 					// check against the other inherited methods to see if they hide this inheritedMethod
 					ReferenceBinding declaringClass = inheritedMethod.declaringClass;
 					if (declaringClass.isInterface())

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java

@@ -1833,14 +1833,6 @@ public final boolean isUsed() {
 	return (this.modifiers & ExtraCompilerModifiers.AccLocallyUsed) != 0;
 }
 
-/**
- * Answer true if the receiver is deprecated (or any of its enclosing types)
- */
-public final boolean isViewedAsDeprecated() {
-	if ((this.modifiers & ClassFileConstants.AccDeprecated) != 0)
-		return true;
-	return false;
-}
 public boolean isImplicitType() {
 	return false;
 }

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/Scope.java

@@ -3897,28 +3897,28 @@ public boolean isInsideDeprecatedCode(){
 					ReferenceContext referenceContext = methodScope.referenceContext();
 					if (referenceContext instanceof AbstractMethodDeclaration) {
 						MethodBinding context = ((AbstractMethodDeclaration) referenceContext).binding;
-						if (context != null && context.isViewedAsDeprecated())
+						if (context != null && context.isDeprecated())
 							return true;
 					} else if (referenceContext instanceof ModuleDeclaration) {
 						ModuleBinding context = ((ModuleDeclaration) referenceContext).binding;
 						return context != null && context.isDeprecated();
 					}
-				} else if (methodScope.initializedField != null && methodScope.initializedField.isViewedAsDeprecated()) {
+				} else if (methodScope.initializedField != null && methodScope.initializedField.isDeprecated()) {
 					// inside field declaration ? check field modifier to see if deprecated
 					return true;
 				}
 				SourceTypeBinding declaringType = ((BlockScope)this).referenceType().binding;
 				if (declaringType != null) {
 					declaringType.initializeDeprecatedAnnotationTagBits(); // may not have been resolved until then
-					if (declaringType.isViewedAsDeprecated())
+					if (declaringType.isDeprecated())
 						return true;
 				}
 				break;
 			case Scope.CLASS_SCOPE :
 				ReferenceBinding context = ((ClassScope)this).referenceType().binding;
 				if (context != null) {
 					context.initializeDeprecatedAnnotationTagBits(); // may not have been resolved until then
-					if (context.isViewedAsDeprecated())
+					if (context.isDeprecated())
 						return true;
 				}
 				break;
@@ -3929,7 +3929,7 @@ public boolean isInsideDeprecatedCode(){
 					SourceTypeBinding type = unit.types[0].binding;
 					if (type != null) {
 						type.initializeDeprecatedAnnotationTagBits(); // may not have been resolved until then
-						if (type.isViewedAsDeprecated())
+						if (type.isDeprecated())
 							return true;
 					}
 				}

org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java

@@ -4252,6 +4252,7 @@ protected void tearDown() throws Exception {
 				Util.flushDirectoryContent(JAVAC_OUTPUT_DIR);
 			}
 			printJavacResultsSummary();
+			javacUsePathOption(" -classpath ");
 		}
 	}
 	/**