ECJ writes incorrect enclosing method for doubly-nested anonymous cla…

…ss (#1906) * Do not traverse past enclosing type declaration to compute enclosing method * Fixes #1905
eclipse-jdt · Jan 25, 2024 · 856cefa · 856cefa
1 parent a2da032
commit 856cefa
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 14 deletions.
diff --git a/...ipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java b/...ipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
@@ -1735,6 +1735,24 @@ public TypeDeclaration referenceType() {
 		return this.referenceContext;
 	}
 
+	public final MethodBinding enclosingMethod() {
+		Scope scope = this;
+		while ((scope = scope.parent) != null) {
+			if (scope instanceof MethodScope) {
+				MethodScope methodScope = (MethodScope) scope;
+				/* 4.7.7 The EnclosingMethod Attribute: ... In particular, method_index must be zero if the current class
+				 * was immediately enclosed in source code by an instance initializer, static initializer, instance variable initializer, or
+				 * class variable initializer....
+				 */
+				if (methodScope.referenceContext instanceof TypeDeclaration)
+					return null;
+				if (methodScope.referenceContext instanceof AbstractMethodDeclaration)
+					return ((MethodScope) scope).referenceMethodBinding();
+			}
+		}
+		return null; // may answer null if no method around
+	}
+
 	@Override
 	public boolean hasDefaultNullnessFor(int location, int sourceStart) {
 		int nonNullByDefaultValue = localNonNullByDefaultValue(sourceStart);

diff --git a/...dt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java b/...dt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java
@@ -46,8 +46,7 @@ public LocalTypeBinding(ClassScope scope, SourceTypeBinding enclosingType, CaseS
 	}
 	this.enclosingCase = switchCase;
 	this.sourceStart = typeDeclaration.sourceStart;
-	MethodScope methodScope = scope.lexicallyEnclosingMethodScope();
-	MethodBinding methodBinding = methodScope != null ? methodScope.referenceMethodBinding() : null;
+	MethodBinding methodBinding = scope.enclosingMethod();
 	if (methodBinding != null) {
 		this.enclosingMethod = methodBinding;
 	}

diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/Scope.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/Scope.java
@@ -1160,18 +1160,6 @@ public final MethodScope enclosingMethodScope() {
 		return null; // may answer null if no method around
 	}
 
-	public final MethodScope lexicallyEnclosingMethodScope() {
-		Scope scope = this;
-		while ((scope = scope.parent) != null) {
-			if (scope instanceof MethodScope) {
-				MethodScope methodScope = (MethodScope) scope;
-				if (methodScope.referenceContext instanceof AbstractMethodDeclaration)
-					return (MethodScope) scope;
-			}
-		}
-		return null; // may answer null if no method around
-	}
-
 	public final MethodScope enclosingLambdaScope() {
 		Scope scope = this;
 		while ((scope = scope.parent) != null) {

diff --git a/...iler/src/org/eclipse/jdt/core/tests/compiler/regression/EnclosingMethodAttributeTest.java b/...iler/src/org/eclipse/jdt/core/tests/compiler/regression/EnclosingMethodAttributeTest.java
@@ -22,6 +22,7 @@
 import org.eclipse.jdt.core.tests.util.Util;
 import org.eclipse.jdt.core.util.ClassFileBytesDisassembler;
 import org.eclipse.jdt.internal.compiler.Compiler;
+import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
@@ -257,4 +258,34 @@ public void test004() throws Exception {
 		ReferenceBinding binaryType = batchCompiler.lookupEnvironment.askForType(new char[][] {new char[0], "X$1".toCharArray()}, batchCompiler.lookupEnvironment.UnNamedModule);
 		assertNotNull("Should not be null", binaryType);
 	}
+
+	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1905
+	// ECJ writes incorrect enclosing method for doubly-nested anonymous class
+	public void testGH1905() throws Exception {
+		if (this.complianceLevel < ClassFileConstants.JDK10)
+			return;
+
+		this.runConformTest(
+			new String[] {
+				"X.java",
+				"""
+				public class X {
+					static Object o = new Object () {};
+					public static void main(String[] args) {
+						var outer = new Object() {
+							Object inner = new Object() {
+								//
+							};
+						};
+						System.out.println(o.getClass().getEnclosingMethod());
+						System.out.println(outer.getClass().getEnclosingMethod());
+						System.out.println(outer.inner.getClass().getEnclosingMethod());
+					}
+				}
+				"""
+			},
+			"null\n" +
+			"public static void X.main(java.lang.String[])\n" +
+			"null");
+	}
 }