Merge pull request #1088 from hvitved/csharp/no-qname-for-local-scope-vars

calumgrant · web-flow · commit 22294091808d · 2019-03-26T12:58:20.000Z
C#: No qualified names for local scope variables
diff --git a/csharp/ql/src/semmle/code/cil/Variable.qll b/csharp/ql/src/semmle/code/cil/Variable.qll
@@ -28,7 +28,9 @@ class Variable extends DotNet::Variable, Declaration, DataFlowNode, @cil_variabl
 }
 
 /** A stack variable. Either a local variable (`LocalVariable`) or a parameter (`Parameter`). */
-class StackVariable extends Variable, @cil_stack_variable { }
+class StackVariable extends Variable, @cil_stack_variable {
+  override predicate hasQualifiedName(string qualifier, string name) { none() }
+}
 
 /**
  * A local variable.
diff --git a/csharp/ql/src/semmle/code/csharp/Variable.qll b/csharp/ql/src/semmle/code/csharp/Variable.qll
@@ -111,6 +111,8 @@ class LocalScopeVariable extends Variable, @local_scope_variable {
    * Holds if this local variable or parameter is a `ref`.
    */
   predicate isRef() { none() }
+
+  override predicate hasQualifiedName(string qualifier, string name) { none() }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,9 @@ class Variable extends DotNet::Variable, Declaration, DataFlowNode, @cil_variabl`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	/** A stack variable. Either a local variable (`LocalVariable`) or a parameter (`Parameter`). */
`31`		`-class StackVariable extends Variable, @cil_stack_variable { }`
	`31`	`+class StackVariable extends Variable, @cil_stack_variable {`
	`32`	`+ override predicate hasQualifiedName(string qualifier, string name) { none() }`
	`33`	`+}`
`32`	`34`
`33`	`35`	`/**`
`34`	`36`	`* A local variable.`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ class LocalScopeVariable extends Variable, @local_scope_variable {`
`111`	`111`	* Holds if this local variable or parameter is a `ref`.
`112`	`112`	`*/`
`113`	`113`	`predicate isRef() { none() }`
	`114`	`+`
	`115`	`+ override predicate hasQualifiedName(string qualifier, string name) { none() }`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`/**`