members of a deprecated type are not implicitly deprecated (#4564)

Remove everything relating to AccDeprecatedImplicitly

Test from #4562

Fixes #4553

Author: stephan-herrmann

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

@@ -290,13 +290,6 @@ public TypeBinding resolveType(BlockScope blockScope, boolean skipKosherCheck) {
 							blockScope.enclosingSourceType());
 		this.binding.typeVariables = Binding.NO_TYPE_VARIABLES;
 
-		MethodScope enm = this.scope.namedMethodScope();
-		MethodBinding enmb = enm == null ? null : enm.referenceMethodBinding();
-		if (enmb != null && enmb.isViewedAsDeprecated()) {
-			this.binding.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
-			this.binding.tagBits |= enmb.tagBits & TagBits.AnnotationTerminallyDeprecated;
-		}
-
 		boolean argumentsHaveErrors = false;
 		if (haveDescriptor) {
 			int parametersLength = this.descriptor.parameters.length;

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

@@ -1852,9 +1852,6 @@ public void updateSupertypesWithAnnotations(Map<ReferenceBinding,ReferenceBindin
 	if (this.binding == null)
 		return;
 	this.binding.getAnnotationTagBits();
-	if (this.binding instanceof MemberTypeBinding) {
-		((MemberTypeBinding) this.binding).updateDeprecationFromEnclosing();
-	}
 	Map<ReferenceBinding,ReferenceBinding> updates = new HashMap<>();
 	if (this.typeParameters != null) {
 		for (TypeParameter typeParameter : this.typeParameters) {

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

@@ -328,8 +328,6 @@ public BinaryTypeBinding(PackageBinding packageBinding, IBinaryType binaryType,
 		this.tagBits |= TagBits.HasUnresolvedEnclosingType;
 		if (enclosingType().isStrictfp())
 			this.modifiers |= ClassFileConstants.AccStrictfp;
-		if (enclosingType().isDeprecated())
-			this.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
 	}
 	if (needFieldsAndMethods)
 		cachePartsFrom(binaryType, true);
@@ -598,19 +596,6 @@ private void cachePartsFrom2(IBinaryType binaryType, boolean needFieldsAndMethod
 			IBinaryField[] iFields = binaryType.getFields();
 			createFields(iFields, binaryType, sourceLevel, missingTypeNames, FIELD_INITIALIZATION);
 			IBinaryMethod[] iMethods = createMethods(binaryType.getMethods(), binaryType, sourceLevel, missingTypeNames);
-			boolean isViewedAsDeprecated = isViewedAsDeprecated();
-			if (isViewedAsDeprecated) {
-				for (FieldBinding field : this.fields) {
-					if (!field.isDeprecated()) {
-						field.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
-					}
-				}
-				for (MethodBinding method : this.methods) {
-					if (!method.isDeprecated()) {
-						method.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
-					}
-				}
-			}
 			if (this.environment.globalOptions.isAnnotationBasedNullAnalysisEnabled) {
 				if (iComponents != null) {
 					for (int i = 0; i < iComponents.length; i++) {

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

@@ -613,35 +613,20 @@ private void checkAndSetModifiers() {
 						if (methodScope.isInsideInitializer()) {
 							SourceTypeBinding type = ((TypeDeclaration) methodScope.referenceContext).binding;
 
-							// inside field declaration ? check field modifier to see if deprecated
-							if (methodScope.initializedField != null) {
-									// currently inside this field initialization
-								if (methodScope.initializedField.isViewedAsDeprecated() && !sourceType.isDeprecated())
-									modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
-							} else {
-								if (type.isStrictfp())
-									modifiers |= ClassFileConstants.AccStrictfp;
-								if (type.isViewedAsDeprecated() && !sourceType.isDeprecated())
-									modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
-							}
+							if (methodScope.initializedField == null && type.isStrictfp())
+								modifiers |= ClassFileConstants.AccStrictfp;
 						} else {
 							MethodBinding method = ((AbstractMethodDeclaration) methodScope.referenceContext).binding;
 							if (method != null) {
 								if (method.isStrictfp())
 									modifiers |= ClassFileConstants.AccStrictfp;
-								if (method.isViewedAsDeprecated() && !sourceType.isDeprecated())
-									modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
 							}
 						}
 						break;
 					case CLASS_SCOPE :
 						// local member
 						if (enclosingType.isStrictfp())
 							modifiers |= ClassFileConstants.AccStrictfp;
-						if (enclosingType.isViewedAsDeprecated() && !sourceType.isDeprecated()) {
-							modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
-							sourceType.tagBits |= enclosingType.tagBits & TagBits.AnnotationTerminallyDeprecated;
-						}
 						break;
 				}
 				scope = scope.parent;

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2020 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -37,7 +37,7 @@ public interface ExtraCompilerModifiers { // modifier constant
 	final int AccFromClassFile = ASTNode.Bit20;
 	final int AccDefaultAbstract = ASTNode.Bit20;
 	// bit21 - use by ClassFileConstants.AccDeprecated
-	final int AccDeprecatedImplicitly = ASTNode.Bit22; // record whether deprecated itself or contained by a deprecated type
+	// bit22 was used for AccDeprecatedImplicitly
 	final int AccAlternateModifierProblem = ASTNode.Bit23;
 	final int AccSemicolonBody = ASTNode.Bit25;
 	final int AccRecord = ASTNode.Bit25;

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

@@ -371,7 +371,7 @@ public final boolean isUsedOnlyInCompound() {
 */
 
 public final boolean isViewedAsDeprecated() {
-	return (this.modifiers & (ClassFileConstants.AccDeprecated | ExtraCompilerModifiers.AccDeprecatedImplicitly)) != 0;
+	return (this.modifiers & ClassFileConstants.AccDeprecated) != 0;
 }
 /* Answer true if the receiver is a volatile field
 */

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

@@ -72,21 +72,6 @@ public void initializeDeprecatedAnnotationTagBits() {
 	}
 	if ((this.extendedTagBits & ExtendedTagBits.DeprecatedAnnotationResolved) == 0) {
 		super.initializeDeprecatedAnnotationTagBits();
-		if ((this.tagBits & TagBits.AnnotationDeprecated) == 0) {
-			// check enclosing type
-			updateDeprecationFromEnclosing();
-		}
-	}
-}
-
-public void updateDeprecationFromEnclosing() {
-	ReferenceBinding enclosing = enclosingType();
-	if ((enclosing.extendedTagBits & ExtendedTagBits.DeprecatedAnnotationResolved) == 0) {
-		enclosing.initializeDeprecatedAnnotationTagBits();
-	}
-	if (enclosing.isViewedAsDeprecated()) {
-		this.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
-		this.tagBits |= (enclosing.tagBits & TagBits.AnnotationTerminallyDeprecated);
 	}
 }
 

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

@@ -984,7 +984,7 @@ public boolean isPolymorphic() {
 /* 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 | ExtraCompilerModifiers.AccDeprecatedImplicitly)) != 0;
+	return (this.modifiers & ClassFileConstants.AccDeprecated) != 0;
 }
 
 @Override

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2024 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -1837,12 +1837,8 @@ public final boolean isUsed() {
  * Answer true if the receiver is deprecated (or any of its enclosing types)
  */
 public final boolean isViewedAsDeprecated() {
-	if ((this.modifiers & (ClassFileConstants.AccDeprecated | ExtraCompilerModifiers.AccDeprecatedImplicitly)) != 0)
+	if ((this.modifiers & ClassFileConstants.AccDeprecated) != 0)
 		return true;
-	if (getPackage().isViewedAsDeprecated()) {
-		this.tagBits |= (getPackage().tagBits & TagBits.AnnotationTerminallyDeprecated);
-		return true;
-	}
 	return false;
 }
 public boolean isImplicitType() {

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

@@ -3890,10 +3890,6 @@ public boolean isInsideDeprecatedCode(){
 						MethodBinding context = ((AbstractMethodDeclaration) referenceContext).binding;
 						if (context != null && context.isViewedAsDeprecated())
 							return true;
-					} else if (referenceContext instanceof LambdaExpression) {
-						MethodBinding context = ((LambdaExpression) referenceContext).binding;
-						if (context != null && context.isViewedAsDeprecated())
-							return true;
 					} else if (referenceContext instanceof ModuleDeclaration) {
 						ModuleBinding context = ((ModuleDeclaration) referenceContext).binding;
 						return context != null && context.isDeprecated();
@@ -3929,6 +3925,8 @@ public boolean isInsideDeprecatedCode(){
 					}
 				}
 		}
+		if (this.parent != null)
+			return this.parent.isInsideDeprecatedCode();
 		return false;
 	}