C++: Add LambdaExpression.getInitializer()

dave-bartolomeo · dave-bartolomeo · commit 87702587146b · 2019-03-25T10:52:57.000-07:00
diff --git a/cpp/ql/src/semmle/code/cpp/exprs/Lambda.qll b/cpp/ql/src/semmle/code/cpp/exprs/Lambda.qll
@@ -57,6 +57,14 @@ class LambdaExpression extends Expr, @lambdaexpr {
   Operator getLambdaFunction() {
     result = getType().(Closure).getLambdaFunction()
   }
+
+  /**
+   * Gets the initializer that initializes the captured variables in the closure, if any.
+   * A lambda that does not capture any variables will not have an initializer.
+   */
+  Expr getInitializer() {
+    result = getChild(0)
+  }
 }
 
 /**
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -270,7 +270,7 @@ newtype TTranslatedElement =
         throw.getExpr().getFullyConverted() = expr
       ) or
       exists(LambdaExpression lambda |
-        lambda.getChild(0).getFullyConverted() = expr
+        lambda.getInitializer().getFullyConverted() = expr
       )
     )
   } or

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,14 @@ class LambdaExpression extends Expr, @lambdaexpr {`
`57`	`57`	`Operator getLambdaFunction() {`
`58`	`58`	`result = getType().(Closure).getLambdaFunction()`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ /**`
	`62`	`+ * Gets the initializer that initializes the captured variables in the closure, if any.`
	`63`	`+ * A lambda that does not capture any variables will not have an initializer.`
	`64`	`+ */`
	`65`	`+ Expr getInitializer() {`
	`66`	`+ result = getChild(0)`
	`67`	`+ }`
`60`	`68`	`}`
`61`	`69`
`62`	`70`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ newtype TTranslatedElement =`
`270`	`270`	`throw.getExpr().getFullyConverted() = expr`
`271`	`271`	`) or`
`272`	`272`	`exists(LambdaExpression lambda \|`
`273`		`- lambda.getChild(0).getFullyConverted() = expr`
	`273`	`+ lambda.getInitializer().getFullyConverted() = expr`
`274`	`274`	`)`
`275`	`275`	`)`
`276`	`276`	`} or`