Guard lookup in BoundSet::allSuperPairsWithCommonGenericTypeRecursive

Contributes to #3327
eclipse-jdt · Dec 6, 2024 · 7f8c6f0 · 7f8c6f0
1 parent 7a31ab7
commit 7f8c6f0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...clipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/BoundSet.java b/...clipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/BoundSet.java
@@ -1279,8 +1279,9 @@ private List<Pair<TypeBinding>> allSuperPairsWithCommonGenericTypeRecursive(Type
 		}
 		if (TypeBinding.equalsEquals(s,  t))
 			return result; // optimization #2: nothing interesting above equal types
-		TypeBinding tSuper = t.findSuperTypeOriginatingFrom(s);
-		if (tSuper != null && s.isParameterizedType() && tSuper.isParameterizedType()) { // optimization #1 again
+
+		TypeBinding tSuper = s.isParameterizedType() ? t.findSuperTypeOriginatingFrom(s) : null;
+		if (tSuper != null && tSuper.isParameterizedType()) { // optimization #1 again
 			result.add(new Pair<>(s, tSuper));
 		}
 		result.addAll(allSuperPairsWithCommonGenericTypeRecursive(s.superclass(), t, visited));