C++: Use 'getAstVariable' now that 'getASTVariable' is deprecated.

MathiasVP · MathiasVP · commit 7593ebaa6237 · 2022-03-14T13:38:27.000Z
diff --git a/cpp/ql/src/Critical/OverflowDestination.ql b/cpp/ql/src/Critical/OverflowDestination.ql
@@ -49,7 +49,7 @@ predicate sourceSized(FunctionCall fc, Expr src) {
 }
 
 predicate readsVariable(LoadInstruction load, Variable var) {
-  load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var
+  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
 }
 
 predicate hasUpperBoundsCheck(Variable var) {
diff --git a/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql b/cpp/ql/src/Security/CWE/CWE-129/ImproperArrayIndexValidation.ql
@@ -37,7 +37,7 @@ predicate linearBoundControls(BasicBlock controlled, SsaDefinition def, StackVar
 }
 
 predicate readsVariable(LoadInstruction load, Variable var) {
-  load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var
+  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
 }
 
 predicate hasUpperBoundsCheck(Variable var) {
diff --git a/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql b/cpp/ql/src/Security/CWE/CWE-190/TaintedAllocationSize.ql
@@ -34,7 +34,7 @@ predicate allocSink(Expr alloc, DataFlow::Node sink) {
 }
 
 predicate readsVariable(LoadInstruction load, Variable var) {
-  load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var
+  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
 }
 
 predicate hasUpperBoundsCheck(Variable var) {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ predicate sourceSized(FunctionCall fc, Expr src) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`predicate readsVariable(LoadInstruction load, Variable var) {`
`52`		`- load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var`
	`52`	`+ load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`predicate hasUpperBoundsCheck(Variable var) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ predicate linearBoundControls(BasicBlock controlled, SsaDefinition def, StackVar`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`predicate readsVariable(LoadInstruction load, Variable var) {`
`40`		`- load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var`
	`40`	`+ load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`predicate hasUpperBoundsCheck(Variable var) {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ predicate allocSink(Expr alloc, DataFlow::Node sink) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`predicate readsVariable(LoadInstruction load, Variable var) {`
`37`		`- load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var`
	`37`	`+ load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`predicate hasUpperBoundsCheck(Variable var) {`