Merge pull request #7561 from aschackmull/java/misc-perf

aschackmull · web-flow · commit 61490e74d8d6 · 2022-01-13T14:43:28.000+01:00
Java: A few perf fixes for getASupertype*().
diff --git a/java/ql/lib/semmle/code/java/dataflow/SSA.qll b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
@@ -366,7 +366,7 @@ private module SsaImpl {
 
   pragma[nomagic]
   private predicate innerclassSupertypeStar(InnerClass t1, RefType t2) {
-    t1.getASupertype*().getSourceDeclaration() = t2
+    t1.getASourceSupertype*().getSourceDeclaration() = t2
   }
 
   /**
diff --git a/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql b/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.ql
@@ -102,7 +102,7 @@ class MismatchedContainerAccess extends MethodAccess {
     |
       this.getCallee()
           .getDeclaringType()
-          .getASupertype*()
+          .getASourceSupertype*()
           .getSourceDeclaration()
           .hasQualifiedName(package, type) and
       this.getCallee().getParameter(i).getType() instanceof TypeObject
diff --git a/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.ql b/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.ql
@@ -72,7 +72,7 @@ class MismatchedContainerModification extends MethodAccess {
     |
       this.getCallee()
           .getDeclaringType()
-          .getASupertype*()
+          .getASourceSupertype*()
           .getSourceDeclaration()
           .hasQualifiedName(package, type) and
       this.getCallee().getParameter(i).getType() instanceof TypeObject

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ private module SsaImpl {`
`366`	`366`
`367`	`367`	`pragma[nomagic]`
`368`	`368`	`private predicate innerclassSupertypeStar(InnerClass t1, RefType t2) {`
`369`		`- t1.getASupertype*().getSourceDeclaration() = t2`
	`369`	`+ t1.getASourceSupertype*().getSourceDeclaration() = t2`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ class MismatchedContainerAccess extends MethodAccess {`
`102`	`102`	`\|`
`103`	`103`	`this.getCallee()`
`104`	`104`	`.getDeclaringType()`
`105`		`- .getASupertype*()`
	`105`	`+ .getASourceSupertype*()`
`106`	`106`	`.getSourceDeclaration()`
`107`	`107`	`.hasQualifiedName(package, type) and`
`108`	`108`	`this.getCallee().getParameter(i).getType() instanceof TypeObject`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class MismatchedContainerModification extends MethodAccess {`
`72`	`72`	`\|`
`73`	`73`	`this.getCallee()`
`74`	`74`	`.getDeclaringType()`
`75`		`- .getASupertype*()`
	`75`	`+ .getASourceSupertype*()`
`76`	`76`	`.getSourceDeclaration()`
`77`	`77`	`.hasQualifiedName(package, type) and`
`78`	`78`	`this.getCallee().getParameter(i).getType() instanceof TypeObject`