Java: getSourceDeclaration() and getASourceSupertype*() commute and this yields much better join-order.

aschackmull · aschackmull · commit 7883124abddf · 2025-07-18T11:47:14.000+02:00
diff --git a/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql b/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql
@@ -103,8 +103,8 @@ class MismatchedContainerAccess extends MethodCall {
     |
       this.getCallee()
           .getDeclaringType()
-          .getASourceSupertype*()
           .getSourceDeclaration()
+          .getASourceSupertype*()
           .hasQualifiedName(package, type) and
       this.getCallee().getParameter(i).getType() instanceof TypeObject
     )
@@ -119,7 +119,7 @@ class MismatchedContainerAccess extends MethodCall {
       containerAccess(package, type, p, this.getCallee().getSignature(), i)
     |
       t = this.getCallee().getDeclaringType() and
-      t.getASourceSupertype*().getSourceDeclaration() = g and
+      t.getSourceDeclaration().getASourceSupertype*() = g and
       g.hasQualifiedName(package, type) and
       indirectlyInstantiates(t, g, p, result)
     )

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ class MismatchedContainerAccess extends MethodCall {`
`103`	`103`	`\|`
`104`	`104`	`this.getCallee()`
`105`	`105`	`.getDeclaringType()`
`106`		`- .getASourceSupertype*()`
`107`	`106`	`.getSourceDeclaration()`
	`107`	`+ .getASourceSupertype*()`
`108`	`108`	`.hasQualifiedName(package, type) and`
`109`	`109`	`this.getCallee().getParameter(i).getType() instanceof TypeObject`
`110`	`110`	`)`
`@@ -119,7 +119,7 @@ class MismatchedContainerAccess extends MethodCall {`
`119`	`119`	`containerAccess(package, type, p, this.getCallee().getSignature(), i)`
`120`	`120`	`\|`
`121`	`121`	`t = this.getCallee().getDeclaringType() and`
`122`		`- t.getASourceSupertype*().getSourceDeclaration() = g and`
	`122`	`+ t.getSourceDeclaration().getASourceSupertype*() = g and`
`123`	`123`	`g.hasQualifiedName(package, type) and`
`124`	`124`	`indirectlyInstantiates(t, g, p, result)`
`125`	`125`	`)`