JS: introduce Expr::getUnderlyingValue

Esben Sparre Andreasen · Esben Sparre Andreasen · commit 8fc89e2e3674 · 2018-10-29T09:22:53.000+01:00
diff --git a/javascript/ql/src/semmle/javascript/Expr.qll b/javascript/ql/src/semmle/javascript/Expr.qll
@@ -47,6 +47,14 @@ class ExprOrType extends @exprortype, Documentable {
 
   /** Gets this expression or type, with any surrounding parentheses removed. */
   ExprOrType stripParens() { result = this }
+
+  /**
+   * Gets the innermost expression that this expression evaluates to.
+   */
+  Expr getUnderlyingValue() {
+    result = this
+  }
+
 }
 
 /** An expression. */
@@ -210,6 +218,11 @@ class ParExpr extends @parexpr, Expr {
   override predicate isImpure() {
     getExpression().isImpure()
   }
+
+  override Expr getUnderlyingValue() {
+    result = getExpression().getUnderlyingValue()
+  }
+
 }
 
 /** A `null` literal. */
@@ -617,6 +630,11 @@ class SeqExpr extends @seqexpr, Expr {
   override string getStringValue() {
     result = getLastOperand().getStringValue()
   }
+
+  override Expr getUnderlyingValue() {
+    result = getLastOperand().getUnderlyingValue()
+  }
+
 }
 
 /** A conditional expression. */
@@ -1284,6 +1302,11 @@ class Assignment extends @assignment, Expr {
   override ControlFlowNode getFirstControlFlowNode() {
     result = getLhs().getFirstControlFlowNode()
   }
+
+  override Expr getUnderlyingValue() {
+    result = getRhs().getUnderlyingValue()
+  }
+
 }
 
 /** A simple assignment expression. */
diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll
@@ -1315,6 +1315,11 @@ class TypeAssertion extends Expr, @typeassertion {
   override ControlFlowNode getFirstControlFlowNode() {
     result = getExpression().getFirstControlFlowNode()
   }
+
+  override Expr getUnderlyingValue() {
+    result = getExpression().getUnderlyingValue()
+  }
+
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1315,6 +1315,11 @@ class TypeAssertion extends Expr, @typeassertion {`
`1315`	`1315`	`override ControlFlowNode getFirstControlFlowNode() {`
`1316`	`1316`	`result = getExpression().getFirstControlFlowNode()`
`1317`	`1317`	`}`
	`1318`	`+`
	`1319`	`+ override Expr getUnderlyingValue() {`
	`1320`	`+ result = getExpression().getUnderlyingValue()`
	`1321`	`+ }`
	`1322`	`+`
`1318`	`1323`	`}`
`1319`	`1324`
`1320`	`1325`	`/**`