Python: Simplify predicate implementation

RasmusWL · yoff · web-flow · commit ed11e8f91643 · 2020-12-18T14:52:20.000+01:00
Co-authored-by: yoff &lt;lerchedahl@gmail.com&gt;
diff --git a/python/ql/src/semmle/python/frameworks/Django.qll b/python/ql/src/semmle/python/frameworks/Django.qll
@@ -1747,13 +1747,11 @@ private module Django {
     abstract DataFlow::Node getViewArg();
 
     final override DjangoRouteHandler getARouteHandler() {
-      exists(DataFlow::Node viewArg | viewArg = getViewArg() |
-        djangoRouteHandlerFunctionTracker(result) = viewArg
-        or
-        exists(DjangoViewClassDef vc |
-          viewArg = vc.asViewResult() and
-          result = vc.getARouteHandler()
-        )
+      djangoRouteHandlerFunctionTracker(result) = getViewArg()
+      or
+      exists(DjangoViewClassDef vc |
+        getViewArg() = vc.asViewResult() and
+        result = vc.getARouteHandler()
       )
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1747,13 +1747,11 @@ private module Django {`
`1747`	`1747`	`abstract DataFlow::Node getViewArg();`
`1748`	`1748`
`1749`	`1749`	`final override DjangoRouteHandler getARouteHandler() {`
`1750`		`- exists(DataFlow::Node viewArg \| viewArg = getViewArg() \|`
`1751`		`- djangoRouteHandlerFunctionTracker(result) = viewArg`
`1752`		`- or`
`1753`		`- exists(DjangoViewClassDef vc \|`
`1754`		`- viewArg = vc.asViewResult() and`
`1755`		`- result = vc.getARouteHandler()`
`1756`		`- )`
	`1750`	`+ djangoRouteHandlerFunctionTracker(result) = getViewArg()`
	`1751`	`+ or`
	`1752`	`+ exists(DjangoViewClassDef vc \|`
	`1753`	`+ getViewArg() = vc.asViewResult() and`
	`1754`	`+ result = vc.getARouteHandler()`
`1757`	`1755`	`)`
`1758`	`1756`	`}`
`1759`	`1757`	`}`