Merge pull request github#7332 from tausbn/python-fix-bad-scope-entry-points-to-join

RasmusWL · web-flow · commit 8ee020f79ccb · 2021-12-10T15:33:13.000+01:00
Python: Fix bad `scope_entry_points_to` join
diff --git a/python/ql/lib/semmle/python/pointsto/PointsTo.qll b/python/ql/lib/semmle/python/pointsto/PointsTo.qll
@@ -656,6 +656,7 @@ module PointsToInternal {
     builtin_not_in_outer_scope(def, context, value, origin)
   }
 
+  pragma[nomagic]
   private predicate undefined_variable(
     ScopeEntryDefinition def, PointsToContext context, ObjectInternal value, ControlFlowNode origin
   ) {
@@ -674,6 +675,7 @@ module PointsToInternal {
     origin = def.getDefiningNode()
   }
 
+  pragma[nomagic]
   private predicate builtin_not_in_outer_scope(
     ScopeEntryDefinition def, PointsToContext context, ObjectInternal value, ControlFlowNode origin
   ) {

Original file line number	Diff line number	Diff line change
`@@ -656,6 +656,7 @@ module PointsToInternal {`
`656`	`656`	`builtin_not_in_outer_scope(def, context, value, origin)`
`657`	`657`	`}`
`658`	`658`
	`659`	`+ pragma[nomagic]`
`659`	`660`	`private predicate undefined_variable(`
`660`	`661`	`ScopeEntryDefinition def, PointsToContext context, ObjectInternal value, ControlFlowNode origin`
`661`	`662`	`) {`
`@@ -674,6 +675,7 @@ module PointsToInternal {`
`674`	`675`	`origin = def.getDefiningNode()`
`675`	`676`	`}`
`676`	`677`
	`678`	`+ pragma[nomagic]`
`677`	`679`	`private predicate builtin_not_in_outer_scope(`
`678`	`680`	`ScopeEntryDefinition def, PointsToContext context, ObjectInternal value, ControlFlowNode origin`
`679`	`681`	`) {`