Merge pull request github#6886 from aschackmull/java-python/perffix-transitive-step-x3

tausbn · web-flow · commit b2e4276bc855 · 2021-10-15T11:06:35.000+02:00
Java/Python: Fix some potential performance problems due to transitive deltas.
diff --git a/java/ql/lib/semmle/code/java/frameworks/Rmi.qll b/java/ql/lib/semmle/code/java/frameworks/Rmi.qll
@@ -14,5 +14,5 @@ class RemoteCallableMethod extends Method {
 private predicate remoteCallableMethod(Method method) {
   method.getDeclaringType().getASupertype() instanceof TypeRemote
   or
-  exists(Method meth | remoteCallableMethod(meth) and method.getAnOverride() = meth)
+  exists(Method meth | remoteCallableMethod(meth) and method.overrides(meth))
 }
diff --git a/python/ql/lib/semmle/python/Exprs.qll b/python/ql/lib/semmle/python/Exprs.qll
@@ -17,7 +17,7 @@ class Expr extends Expr_, AstNode {
    * Whether this expression defines variable `v`
    * If doing dataflow, then consider using SsaVariable.getDefinition() for more precision.
    */
-  predicate defines(Variable v) { this.getASubExpression+().defines(v) }
+  predicate defines(Variable v) { this.getASubExpression().defines(v) }
 
   /** Whether this expression may have a side effect (as determined purely from its syntax) */
   predicate hasSideEffects() {
diff --git a/python/ql/lib/semmle/python/pointsto/PointsTo.qll b/python/ql/lib/semmle/python/pointsto/PointsTo.qll
@@ -300,7 +300,7 @@ module PointsToInternal {
     ssa_definition_points_to(var.getDefinition(), context, value, origin)
     or
     exists(EssaVariable prev |
-      ssaShortCut+(prev, var) and
+      ssaShortCut(prev, var) and
       variablePointsTo(prev, context, value, origin)
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ class RemoteCallableMethod extends Method {`
`14`	`14`	`private predicate remoteCallableMethod(Method method) {`
`15`	`15`	`method.getDeclaringType().getASupertype() instanceof TypeRemote`
`16`	`16`	`or`
`17`		`- exists(Method meth \| remoteCallableMethod(meth) and method.getAnOverride() = meth)`
	`17`	`+ exists(Method meth \| remoteCallableMethod(meth) and method.overrides(meth))`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ module PointsToInternal {`
`300`	`300`	`ssa_definition_points_to(var.getDefinition(), context, value, origin)`
`301`	`301`	`or`
`302`	`302`	`exists(EssaVariable prev \|`
`303`		`- ssaShortCut+(prev, var) and`
	`303`	`+ ssaShortCut(prev, var) and`
`304`	`304`	`variablePointsTo(prev, context, value, origin)`
`305`	`305`	`)`
`306`	`306`	`}`