Merge pull request #7793 from tausbn/python-fix-bad-TPythonTuple-join-order

Python: Fix bad join order in `TPythonTuple`

Author: yoff

python/ql/lib/semmle/python/objects/TObject.qll

@@ -150,8 +150,10 @@ newtype TObject =
   TBuiltinTuple(Builtin bltn) { bltn.getClass() = Builtin::special("tuple") } or
   /** Represents a tuple in the Python source */
   TPythonTuple(TupleNode origin, PointsToContext context) {
-    origin.isLoad() and
-    context.appliesTo(origin)
+    exists(Scope s |
+      context.appliesToScope(s) and
+      scope_loads_tuplenode(s, origin)
+    )
   } or
   /** Varargs tuple */
   TVarargsTuple(CallNode call, PointsToContext context, int offset, int length) {
@@ -201,6 +203,13 @@ newtype TObject =
     Expressions::subscriptPartsPointsTo(_, _, generic, index)
   }
 
+/** Join-order helper for TPythonTuple */
+pragma[nomagic]
+private predicate scope_loads_tuplenode(Scope s, TupleNode origin) {
+  origin.isLoad() and
+  origin.getScope() = s
+}
+
 /** Holds if the object `t` is a type. */
 predicate isType(ObjectInternal t) {
   t.isClass() = true