@@ -16,9 +16,9 @@ where
   exists(IRFunction irFunc |
     irFunc = var.getEnclosingIRFunction() and
     (
-      shouldEscape(var) and variableAddressEscapes(var)
+      shouldEscape(var) and allocationEscapes(var)
       or
-      not shouldEscape(var) and not variableAddressEscapes(var)
+      not shouldEscape(var) and not allocationEscapes(var)
     )
   )
 select var
@@ -1,23 +1,25 @@
 import default
 import semmle.code.cpp.ir.implementation.aliased_ssa.internal.AliasAnalysis
+import semmle.code.cpp.ir.implementation.aliased_ssa.internal.AliasConfiguration
 import semmle.code.cpp.ir.implementation.unaliased_ssa.IR
 import semmle.code.cpp.ir.implementation.UseSoundEscapeAnalysis
 
-predicate shouldEscape(IRAutomaticUserVariable var) {
-  exists(string name |
-    name = var.getVariable().getName() and
-    name.matches("no_%")
-  )
+class InterestingAllocation extends VariableAllocation {
+  IRUserVariable userVar;
+
+  InterestingAllocation() { userVar = this.getIRVariable() }
+
+  final predicate shouldEscape() { userVar.getVariable().getName().matches("no_%") }
 }
 
-from IRAutomaticUserVariable var
+from InterestingAllocation var
 where
   exists(IRFunction irFunc |
     irFunc = var.getEnclosingIRFunction() and
     (
-      shouldEscape(var) and variableAddressEscapes(var)
+      var.shouldEscape() and allocationEscapes(var)
       or
-      not shouldEscape(var) and not variableAddressEscapes(var)
+      not var.shouldEscape() and not allocationEscapes(var)
     )
   )
 select var
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ where`
`16`	`16`	`exists(IRFunction irFunc \|`
`17`	`17`	`irFunc = var.getEnclosingIRFunction() and`
`18`	`18`	`(`
`19`		`- shouldEscape(var) and variableAddressEscapes(var)`
	`19`	`+ shouldEscape(var) and allocationEscapes(var)`
`20`	`20`	`or`
`21`		`- not shouldEscape(var) and not variableAddressEscapes(var)`
	`21`	`+ not shouldEscape(var) and not allocationEscapes(var)`
`22`	`22`	`)`
`23`	`23`	`)`
`24`	`24`	`select var`