Revive some code fixing old bug 154923

Somehow, this code must have gone missing during a merge. https://bugs.eclipse.org/bugs/show_bug.cgi?id=154923 https://github.com/kriegaex/org.aspectj.shadows/blob/48bc984d45b85719348661f0b82a13dca07c7de6/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java#L1315-L1318 Signed-off-by: Alexander Kriegisch <[email protected]>
eclipse-aspectj · Feb 12, 2024 · 848c8c2 · 848c8c2
1 parent 7b4a172
commit 848c8c2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/...se.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/FieldBinding.java b/...se.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/FieldBinding.java
@@ -432,12 +432,19 @@ public void setAnnotations(AnnotationBinding[] annotations, boolean forceStore)
 }
 public FieldDeclaration sourceField() {
 	SourceTypeBinding sourceType;
+	//	AspectJ Extension
+	if (declaringClass instanceof BinaryTypeBinding) return null;
+	//	End AspectJ Extension
 	try {
 		sourceType = (SourceTypeBinding) this.declaringClass;
 	} catch (ClassCastException e) {
 		return null;
 	}
 
+	// AspectJ Extension
+	// guard due to pr154923 - an npe occurs that is probably disguising an underlying problem that will be reported properly
+	if (sourceType.scope==null || sourceType.scope.referenceContext==null || sourceType.scope.referenceContext.methods==null) return null;
+	// End AspectJ Extension
 	FieldDeclaration[] fields = sourceType.scope.referenceContext.fields;
 	if (fields != null) {
 		for (int i = fields.length; --i >= 0;)