JEP 181 - Nest based access control - Code review driven cleanup (eclipse-jdt#4197)

Author: srikanth-sankaran

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ClassFile.java

@@ -104,7 +104,6 @@ public class ClassFile implements TypeConstants, TypeIds {
 	// that collection contains all the remaining bytes of the .class file
 	public int headerOffset;
 	public Map<TypeBinding, Boolean> innerClassesBindings;
-	public Set<SourceTypeBinding> nestMembers;
 	public List<Object> bootstrapMethods = null;
 	public int methodCount;
 	public int methodCountOffset;
@@ -124,7 +123,6 @@ public class ClassFile implements TypeConstants, TypeIds {
 	public static final int INITIAL_CONTENTS_SIZE = 400;
 	public static final int INITIAL_HEADER_SIZE = 1500;
 	public static final int INNER_CLASSES_SIZE = 5;
-	public static final int NESTED_MEMBER_SIZE = 5;
 
 	// TODO: Move these to an enum?
 	public static final String ALTMETAFACTORY_STRING = new String(ConstantPool.ALTMETAFACTORY);
@@ -402,8 +400,7 @@ public int compare(ReferenceBinding o1, ReferenceBinding o2) {
 		attributesNumber += generateTypeAnnotationAttributeForTypeDeclaration();
 
 		if (this.targetJDK >= ClassFileConstants.JDK11) {
-			// add nestMember and nestHost attributes
-			attributesNumber += generateNestAttributes();
+			attributesNumber += generateNestAttributes(); // add nestMember and nestHost attributes
 		}
 		if (this.targetJDK >= ClassFileConstants.JDK16) {
 			attributesNumber += generateRecordAttribute();
@@ -2683,8 +2680,8 @@ private int generateNestHostAttribute() {
 		if (nestHost == null)
 			return 0;
 		int localContentsOffset = this.contentsOffset;
-		if (localContentsOffset + 10 >= this.contents.length) {
-			resizeContents(10);
+		if (localContentsOffset + 8 >= this.contents.length) {
+			resizeContents(8);
 		}
 		int nestHostAttributeNameIndex =
 			this.constantPool.literalIndex(AttributeNamesConstants.NestHost);
@@ -2705,12 +2702,19 @@ private int generateNestHostAttribute() {
 	}
 	private int generateNestMembersAttribute() {
 
-		int localContentsOffset = this.contentsOffset;
-		List<String> nestedMembers = getNestMembers();
+		Set<SourceTypeBinding> nestMembers = this.referenceBinding.getNestMembers();
+		if (nestMembers == null )
+			return 0;
+		List<String> nestedMembers = nestMembers
+										.stream()
+										.map(s -> new String(s.constantPoolName()))
+										.sorted()
+										.collect(Collectors.toList());
 		int numberOfNestedMembers = nestedMembers != null ? nestedMembers.size() : 0;
-		if (numberOfNestedMembers == 0) // JVMS 11 4.7.29 says "at most one" NestMembers attribute - return if none.
+		if (numberOfNestedMembers == 0)
 			return 0;
 
+		int localContentsOffset = this.contentsOffset;
 		int exSize = 8 + 2 * numberOfNestedMembers;
 		if (exSize + localContentsOffset >= this.contents.length) {
 			resizeContents(exSize);
@@ -2737,7 +2741,7 @@ private int generateNestMembersAttribute() {
 		return 1;
 	}
 	private int generateNestAttributes() {
-		int nAttrs = generateNestMembersAttribute(); //either member or host will exist 4.7.29
+		int nAttrs = generateNestMembersAttribute(); // either member or host will exist 4.7.29
 		nAttrs += generateNestHostAttribute();
 		return nAttrs;
 	}
@@ -5950,25 +5954,6 @@ public void recordInnerClasses(TypeBinding binding, boolean onBottomForBug445231
 			enclosingType = enclosingType.enclosingType();
 		}
 	}
-	public void recordNestMember(SourceTypeBinding binding) {
-		SourceTypeBinding nestHost = binding != null ? binding.getNestHost() : null;
-		if (nestHost != null && !binding.equals(nestHost)) {// member
-			if (this.nestMembers == null) {
-				this.nestMembers = new HashSet<>(NESTED_MEMBER_SIZE);
-			}
-			this.nestMembers.add(binding);
-		}
-	}
-	public List<String> getNestMembers() {
-		if (this.nestMembers == null)
-			return null;
-		List<String> list = this.nestMembers
-								.stream()
-								.map(s -> new String(s.constantPoolName()))
-								.sorted()
-								.collect(Collectors.toList());
-		return list;
-	}
 
 	public int recordBootstrapMethod(FunctionalExpression expression) {
 		if (this.bootstrapMethods == null) {
@@ -6071,9 +6056,6 @@ public void reset(/*@Nullable*/SourceTypeBinding typeBinding, CompilerOptions op
 		if (this.innerClassesBindings != null) {
 			this.innerClassesBindings.clear();
 		}
-		if (this.nestMembers != null) {
-			this.nestMembers.clear();
-		}
 		if (this.bootstrapMethods != null) {
 			this.bootstrapMethods.clear();
 		}

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

@@ -609,12 +609,7 @@ public void generateCode(ClassFile enclosingClassFile) {
 			enclosingClassFile.recordInnerClasses(this.binding);
 			classFile.recordInnerClasses(this.binding);
 		}
-		SourceTypeBinding nestHost = this.binding.getNestHost();
-		if (nestHost != null && !TypeBinding.equalsEquals(nestHost, this.binding)) {
-			ClassFile ocf = enclosingClassFile.outerMostEnclosingClassFile();
-			if (ocf != null)
-				ocf.recordNestMember(this.binding);
-		}
+
 		TypeVariableBinding[] typeVariables = this.binding.typeVariables();
 		for (TypeVariableBinding typeVariableBinding : typeVariables) {
 			if ((typeVariableBinding.tagBits & TagBits.ContainsNestedTypeReferences) != 0) {
@@ -1469,7 +1464,7 @@ public void resolve() {
 				reporter.close();
 			}
 		}
-		updateNestHost();
+		updateNestRelations();
 		FieldDeclaration[] fieldsDecls = this.fields;
 		if (fieldsDecls != null) {
 			for (FieldDeclaration fieldDeclaration : fieldsDecls)
@@ -1795,19 +1790,34 @@ void updateMaxFieldCount() {
 	}
 }
 
-private SourceTypeBinding findNestHost() {
-	ClassScope classScope = this.scope.enclosingTopMostClassScope();
-	return classScope != null ? classScope.referenceContext.binding : null;
-}
+private final void updateNestRelations() {
 
-void updateNestHost() {
-	if (this.binding == null)
-		return;
-	SourceTypeBinding nestHost = findNestHost();
-	if (nestHost != null && !this.binding.equals(nestHost)) {// member
+	ClassScope outerMostClassScope = this.scope;
+	Scope skope = this.scope;
+
+	while (skope != null && skope.kind != Scope.COMPILATION_UNIT_SCOPE) {
+		switch (skope.kind) {
+			case Scope.METHOD_SCOPE :
+				ReferenceContext context = ((MethodScope) skope).referenceContext;
+				if (context instanceof LambdaExpression lambdaExpression) {
+					if (lambdaExpression != lambdaExpression.original) // transient unreal universe.
+						return;
+				}
+				break;
+			case Scope.CLASS_SCOPE:
+				outerMostClassScope = (ClassScope) skope;
+				break;
+		}
+		skope = skope.parent;
+	}
+
+	SourceTypeBinding nestHost =  outerMostClassScope != null ? outerMostClassScope.referenceContext.binding : null;
+	if (nestHost != null && !this.binding.equals(nestHost)) {
 		this.binding.setNestHost(nestHost);
+		nestHost.addNestMember(this.binding);
 	}
 }
+
 public boolean isPackageInfo() {
 	return CharOperation.equals(this.name,  TypeConstants.PACKAGE_INFO_NAME);
 }

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java

@@ -501,28 +501,6 @@ public ClassFileReader(byte[] classFileBytes, char[] fileName, boolean fullyInit
 						this.moduleName = this.moduleDeclaration.name();
 					}
 					break;
-				case 'N' :
-					if (CharOperation.equals(attributeName, AttributeNamesConstants.NestHost)) {
-						utf8Offset =
-							this.constantPoolOffsets[u2At(this.constantPoolOffsets[u2At(readOffset + 6)] + 1)];
-						@SuppressWarnings("unused")
-						char[] nestHos = utf8At(utf8Offset + 3, u2At(utf8Offset + 1));
-					} else if (CharOperation.equals(attributeName, AttributeNamesConstants.NestMembers)) {
-						int offset = readOffset + 6;
-						int nestMembersCount = u2At(offset);
-						if (nestMembersCount != 0) {
-							offset += 2;
-							/** unused */
-							char[][] nestMember = new char[nestMembersCount][];
-							for (int j = 0; j < nestMembersCount; j++) {
-								utf8Offset =
-									this.constantPoolOffsets[u2At(this.constantPoolOffsets[u2At(offset)] + 1)];
-		 						nestMember[j] = utf8At(utf8Offset + 3, u2At(utf8Offset + 1));
-		 						offset += 2;
-							}
-						}
-					}
-					break;
 				case 'P' :
 					if (CharOperation.equals(attributeName, AttributeNamesConstants.PermittedSubclasses)) {
 						int offset = readOffset + 6;

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

@@ -1421,14 +1421,13 @@ public boolean isRecord() {
 }
 
 private static SourceTypeBinding getSourceTypeBinding(ReferenceBinding ref) {
-	if (ref instanceof SourceTypeBinding)
-		return (SourceTypeBinding) ref;
-	if (ref instanceof ParameterizedTypeBinding) {
-		ParameterizedTypeBinding ptb = (ParameterizedTypeBinding) ref;
-		return ptb.type instanceof SourceTypeBinding ? (SourceTypeBinding) ptb.type : null;
-	}
+	if (ref instanceof SourceTypeBinding stb)
+		return stb;
+	if (ref instanceof ParameterizedTypeBinding ptb)
+		return ptb.type instanceof SourceTypeBinding stb ? stb : null;
 	return null;
 }
+
 public  boolean isNestmateOf(ReferenceBinding other) {
 	SourceTypeBinding s1 = getSourceTypeBinding(this);
 	SourceTypeBinding s2 = getSourceTypeBinding(other);

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

@@ -1141,15 +1141,6 @@ public ClassScope enclosingInstanceScope() {
 		}
 	}
 
-	public final ClassScope enclosingTopMostClassScope() {
-		Scope scope = this;
-		while (scope != null) {
-			Scope t = scope.parent;
-			if (t instanceof CompilationUnitScope) break;
-			scope = t;
-		}
-		return scope instanceof ClassScope ? ((ClassScope) scope) : null;
-	}
 	public final MethodScope enclosingMethodScope() {
 		Scope scope = this;
 		while ((scope = scope.parent) != null) {
@@ -4908,14 +4899,14 @@ private ReferenceBinding[] getFilteredExceptions(MethodBinding method) {
 	}
 
 	public final ClassScope outerMostClassScope() {
-		ClassScope lastClassScope = null;
+		ClassScope outerMostClassScope = null;
 		Scope scope = this;
 		do {
-			if (scope instanceof ClassScope)
-				lastClassScope = (ClassScope) scope;
+			if (scope instanceof ClassScope classScope)
+				outerMostClassScope = classScope;
 			scope = scope.parent;
 		} while (scope != null);
-		return lastClassScope; // may answer null if no class around
+		return outerMostClassScope; // may answer null if no class around
 	}
 
 	public final MethodScope outerMostMethodScope() {

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

@@ -55,15 +55,7 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.compiler.lookup;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy;
 import org.eclipse.jdt.internal.compiler.ast.*;
@@ -112,6 +104,7 @@ public class SourceTypeBinding extends ReferenceBinding {
 	public ExternalAnnotationProvider externalAnnotationProvider;
 
 	private SourceTypeBinding nestHost;
+	private Set<SourceTypeBinding> nestMembers;
 
 	public boolean isImplicit = false;
 	public boolean supertypeAnnotationsUpdated = false; // have any supertype annotations been updated during CompleteTypeBindingsSteps.INTEGRATE_ANNOTATIONS_IN_HIERARCHY?
@@ -2850,6 +2843,18 @@ public SourceTypeBinding getNestHost() {
 	return this.nestHost;
 }
 
+public Set<SourceTypeBinding> getNestMembers() {
+	return this.nestMembers;
+}
+
+public void addNestMember(SourceTypeBinding member) {
+	if (!member.equals(this)) {
+		if (this.nestMembers == null)
+			this.nestMembers = new HashSet<>(6);
+		this.nestMembers.add(member);
+	}
+}
+
 public void setNestHost(SourceTypeBinding nestHost) {
 	this.nestHost = nestHost;
 }