@@ -483,6 +483,7 @@ module Flow<
   }
 
   /** Gets the enclosing callable of `ce`. */
+  pragma[nomagic]
   private Callable closureExprGetEnclosingCallable(ClosureExpr ce) {
     exists(BasicBlock bb | ce.hasCfgNode(bb, _) and result = bb.getEnclosingCallable())
   }
@@ -496,6 +497,13 @@ module Flow<
     )
   }
 
+  /** Holds if `outer` contains or equals `inner` */
+  bindingset[outer, inner]
+  pragma[inline_late]
+  private predicate isEnclosingCallable(Callable outer, Callable inner) {
+    outer = callableGetEnclosingCallable*(inner)
+  }
+
   /**
    * Gets a callable that contains `ce`, or a reference to `ce` into which `ce` could be inlined without
    * bringing any variables out of scope.
@@ -512,7 +520,7 @@ module Flow<
       expr.hasCfgNode(bb, _) and
       result = bb.getEnclosingCallable() and
       // The reference to `ce` is allowed to occur in a more deeply nested context
-      closureExprGetEnclosingCallable(ce) = callableGetEnclosingCallable*(result)
+      isEnclosingCallable(closureExprGetEnclosingCallable(ce), result)
     )
   }
Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,7 @@ module Flow<`
`483`	`483`	`}`
`484`	`484`
`485`	`485`	/** Gets the enclosing callable of `ce`. */
	`486`	`+ pragma[nomagic]`
`486`	`487`	`private Callable closureExprGetEnclosingCallable(ClosureExpr ce) {`
`487`	`488`	`exists(BasicBlock bb \| ce.hasCfgNode(bb, _) and result = bb.getEnclosingCallable())`
`488`	`489`	`}`
`@@ -496,6 +497,13 @@ module Flow<`
`496`	`497`	`)`
`497`	`498`	`}`
`498`	`499`
	`500`	+ /** Holds if `outer` contains or equals `inner` */
	`501`	`+ bindingset[outer, inner]`
	`502`	`+ pragma[inline_late]`
	`503`	`+ private predicate isEnclosingCallable(Callable outer, Callable inner) {`
	`504`	`+ outer = callableGetEnclosingCallable*(inner)`
	`505`	`+ }`
	`506`	`+`
`499`	`507`	`/**`
`500`	`508`	* Gets a callable that contains `ce`, or a reference to `ce` into which `ce` could be inlined without
`501`	`509`	`* bringing any variables out of scope.`
`@@ -512,7 +520,7 @@ module Flow<`
`512`	`520`	`expr.hasCfgNode(bb, _) and`
`513`	`521`	`result = bb.getEnclosingCallable() and`
`514`	`522`	// The reference to `ce` is allowed to occur in a more deeply nested context
`515`		`- closureExprGetEnclosingCallable(ce) = callableGetEnclosingCallable*(result)`
	`523`	`+ isEnclosingCallable(closureExprGetEnclosingCallable(ce), result)`
`516`	`524`	`)`
`517`	`525`	`}`
`518`	`526`