Fix failing tests

tamasvajk · tamasvajk · commit ba730b6f02e6 · 2020-11-11T09:46:18.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/PrintAst.qll b/csharp/ql/src/semmle/code/csharp/PrintAst.qll
@@ -136,6 +136,7 @@ private newtype TPrintAstNode =
   TAttributesNode(Attributable attributable) {
     shouldPrint(attributable, _) and
     exists(attributable.getAnAttribute()) and
+    exists(Attribute a | a = attributable.getAnAttribute() | shouldPrint(a, _)) and
     not isNotNeeded(attributable)
   } or
   TTypeParametersNode(UnboundGeneric unboundGeneric) {
@@ -298,7 +299,10 @@ class ControlFlowElementNode extends ElementNode {
           controlFlowElement.getParent*()
       )
     ) and
-    not isNotNeeded(element.getParent+())
+    not isNotNeeded(element.getParent+()) and
+    // LambdaExpr is both a Callable and a ControlFlowElement,
+    // print it with the more specific CallableNode
+    not element instanceof Callable
   }
 
   override PrintAstNode getChild(int childIndex) {
diff --git a/csharp/ql/test/library-tests/arguments/argumentName.ql b/csharp/ql/test/library-tests/arguments/argumentName.ql
@@ -1,4 +1,5 @@
 import csharp
 
 from Expr argument
+where argument.fromSource()
 select argument, argument.getExplicitArgumentName()
diff --git a/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.ql b/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.ql
@@ -2,4 +2,5 @@ import csharp
 import Common
 
 from SourceBasicBlock bb
+where bb.getLocation().getFile().fromSource()
 select bb.getFirstNode(), bb.getLastNode(), bb.length()
diff --git a/csharp/ql/test/library-tests/controlflow/graph/Dominance.ql b/csharp/ql/test/library-tests/controlflow/graph/Dominance.ql
@@ -2,15 +2,23 @@ import csharp
 import Common
 
 query predicate dominance(SourceControlFlowNode dom, SourceControlFlowNode node) {
-  dom.strictlyDominates(node) and dom.getASuccessor() = node
+  dom.strictlyDominates(node) and
+  dom.getASuccessor() = node and
+  dom.getLocation().getFile().fromSource()
 }
 
 query predicate postDominance(SourceControlFlowNode dom, SourceControlFlowNode node) {
-  dom.strictlyPostDominates(node) and dom.getAPredecessor() = node
+  dom.strictlyPostDominates(node) and
+  dom.getAPredecessor() = node and
+  dom.getLocation().getFile().fromSource()
 }
 
-query predicate blockDominance(SourceBasicBlock dom, SourceBasicBlock bb) { dom.dominates(bb) }
+query predicate blockDominance(SourceBasicBlock dom, SourceBasicBlock bb) {
+  dom.dominates(bb) and
+  dom.getLocation().getFile().fromSource()
+}
 
 query predicate postBlockDominance(SourceBasicBlock dom, SourceBasicBlock bb) {
-  dom.postDominates(bb)
+  dom.postDominates(bb) and
+  dom.getLocation().getFile().fromSource()
 }
diff --git a/csharp/ql/test/library-tests/controlflow/graph/EntryElement.ql b/csharp/ql/test/library-tests/controlflow/graph/EntryElement.ql
@@ -3,4 +3,5 @@ import Common
 import ControlFlow::Internal
 
 from SourceControlFlowElement cfe
+where cfe.fromSource()
 select cfe, first(cfe)
diff --git a/csharp/ql/test/library-tests/controlflow/graph/ExitElement.ql b/csharp/ql/test/library-tests/controlflow/graph/ExitElement.ql
@@ -4,4 +4,5 @@ private import semmle.code.csharp.controlflow.internal.Completion
 import Common
 
 from SourceControlFlowElement cfe, Completion c
+where cfe.fromSource()
 select cfe, last(cfe, c), c
diff --git a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql
@@ -4,7 +4,10 @@ import Common
 query predicate edges(
   SourceControlFlowNode node, SourceControlFlowNode successor, string attr, string val
 ) {
-  exists(ControlFlow::SuccessorType t | successor = node.getASuccessorByType(t) |
+  exists(ControlFlow::SuccessorType t |
+    successor = node.getASuccessorByType(t) and
+    (node.getElement().fromSource() or successor.getElement().fromSource())
+  |
     attr = "semmle.label" and
     val = t.toString()
   )
diff --git a/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.ql b/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.ql
@@ -1,8 +1,12 @@
 import csharp
 private import semmle.code.csharp.controlflow.Guards
 
-query predicate abstractValue(AbstractValue value, Expr e) { e = value.getAnExpr() }
+query predicate abstractValue(AbstractValue value, Expr e) {
+  e = value.getAnExpr() and e.fromSource()
+}
 
 query predicate dualValue(AbstractValue value, AbstractValue dual) { dual = value.getDualValue() }
 
-query predicate singletonValue(AbstractValue value) { value.isSingleton() }
+query predicate singletonValue(AbstractValue value) {
+  value.isSingleton() and value.getAnExpr().fromSource()
+}
diff --git a/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.ql b/csharp/ql/test/library-tests/controlflow/splits/SplittingStressTest.ql
@@ -1,7 +1,7 @@
 import csharp
 
 query predicate countSplits(ControlFlowElement cfe, int i) {
-  i = strictcount(ControlFlow::Nodes::ElementNode n | n.getElement() = cfe)
+  i = strictcount(ControlFlow::Nodes::ElementNode n | n.getElement() = cfe and cfe.fromSource())
 }
 
-query predicate ssaDef(Ssa::Definition def) { any() }
+query predicate ssaDef(Ssa::Definition def) { def.getLocation().getFile().fromSource() }
diff --git a/csharp/ql/test/library-tests/csharp7.2/NumericLiterals.ql b/csharp/ql/test/library-tests/csharp7.2/NumericLiterals.ql
@@ -1,4 +1,5 @@
 import csharp
 
 from IntLiteral l
+where l.fromSource()
 select l
diff --git a/csharp/ql/test/library-tests/csharp7.3/ArrayCreations.ql b/csharp/ql/test/library-tests/csharp7.3/ArrayCreations.ql
@@ -1,11 +1,13 @@
 import csharp
 
 query predicate arrayCreation(ArrayCreation creation, int i, Expr length) {
+  creation.fromSource() and
   length = creation.getLengthArgument(i)
 }
 
 query predicate arrayElement(ArrayCreation array, int i, Expr element) {
+  array.fromSource() and
   element = array.getInitializer().getElement(i)
 }
 
-query predicate stackalloc(Stackalloc a) { any() }
+query predicate stackalloc(Stackalloc a) { a.fromSource() }
diff --git a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql
@@ -2,5 +2,7 @@ import csharp
 import semmle.code.csharp.dataflow.TaintTracking
 
 from DataFlow::Node pred, DataFlow::Node succ
-where TaintTracking::localTaintStep(pred, succ)
+where
+  TaintTracking::localTaintStep(pred, succ) and
+  pred.getLocation().getFile().fromSource()
 select pred, succ
diff --git a/csharp/ql/test/library-tests/csharp7/TaintReaches.ql b/csharp/ql/test/library-tests/csharp7/TaintReaches.ql
@@ -2,5 +2,7 @@ import csharp
 import semmle.code.csharp.dataflow.TaintTracking
 
 from StringLiteral l, DataFlow::Node n
-where TaintTracking::localTaintStep+(DataFlow::exprNode(l), n)
+where
+  TaintTracking::localTaintStep+(DataFlow::exprNode(l), n) and
+  n.getLocation().getFile().fromSource()
 select l, n
diff --git a/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.ql b/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.ql
@@ -1,5 +1,7 @@
 import csharp
 
 from DataFlow::Node pred, DataFlow::Node succ
-where DataFlow::localFlowStep(pred, succ)
+where
+  DataFlow::localFlowStep(pred, succ) and
+  pred.getLocation().getFile().fromSource()
 select pred, succ
diff --git a/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.ql b/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.ql
@@ -1,5 +1,7 @@
 import csharp
 
 from DataFlow::Node pred, DataFlow::Node succ
-where TaintTracking::localTaintStep(pred, succ)
+where
+  TaintTracking::localTaintStep(pred, succ) and
+  pred.getLocation().getFile().fromSource()
 select pred, succ
diff --git a/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.ql b/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.ql
@@ -4,5 +4,5 @@ import semmle.code.csharp.dataflow.ModulusAnalysis
 import semmle.code.csharp.dataflow.Bound
 
 from ControlFlow::Nodes::ExprNode e, Bound b, int delta, int mod
-where exprModulus(e, b, delta, mod)
+where exprModulus(e, b, delta, mod) and e.getExpr().fromSource()
 select e, b.toString(), delta, mod
diff --git a/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.ql b/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.ql
@@ -18,4 +18,5 @@ string getASignString(ControlFlow::Nodes::ExprNode e) {
 }
 
 from ControlFlow::Nodes::ExprNode e
+where e.getExpr().fromSource()
 select e, strictconcat(string s | s = getASignString(e) | s, " ")
diff --git a/csharp/ql/test/library-tests/expressions/ArrayCreation11.ql b/csharp/ql/test/library-tests/expressions/ArrayCreation11.ql
@@ -9,5 +9,9 @@ private boolean isImplicit(Expr expr) {
 }
 
 from ArrayCreation ac, Expr expr
-where ac.isImplicitlySized() and not ac.isImplicitlyTyped() and expr = ac.getALengthArgument()
+where
+  ac.isImplicitlySized() and
+  not ac.isImplicitlyTyped() and
+  expr = ac.getALengthArgument() and
+  ac.fromSource()
 select ac, expr, isImplicit(expr)
diff --git a/csharp/ql/test/library-tests/expressions/PrintAst.expected b/csharp/ql/test/library-tests/expressions/PrintAst.expected
@@ -1995,76 +1995,76 @@ expressions.cs:
 #  449|               2: [TypeMention] byte
 #  449|             0: [LocalVariableAccess] access to local variable f1
 #  449|             1: [LambdaExpr] (...) => ...
-#  449|               0: [CastExpr] (...) ...
+#-----|               2: (Parameters)
+#  449|                 0: [Parameter] x
+#  449|               4: [CastExpr] (...) ...
 #  449|                 0: [TypeAccess] access to type Byte
 #  449|                   0: [TypeMention] byte
 #  449|                 1: [AddExpr] ... + ...
 #  449|                   0: [CastExpr] (...) ...
 #  449|                     1: [ParameterAccess] access to parameter x
 #  449|                   1: [IntLiteral] 1
-#-----|               2: (Parameters)
-#  449|                 0: [Parameter] x
 #  450|         1: [LocalVariableDeclStmt] ... ...;
 #  450|           0: [LocalVariableDeclAndInitExpr] Func<Int32,Double> f2 = ...
 #  450|             -1: [TypeMention] Func<Int32, Double>
 #  450|               1: [TypeMention] int
 #  450|               2: [TypeMention] double
 #  450|             0: [LocalVariableAccess] access to local variable f2
 #  450|             1: [LambdaExpr] (...) => ...
-#  450|               0: [BlockStmt] {...}
+#-----|               2: (Parameters)
+#  450|                 0: [Parameter] x
+#  450|               4: [BlockStmt] {...}
 #  450|                 0: [ReturnStmt] return ...;
 #  450|                   0: [CastExpr] (...) ...
 #  450|                     1: [AddExpr] ... + ...
 #  450|                       0: [ParameterAccess] access to parameter x
 #  450|                       1: [IntLiteral] 1
-#-----|               2: (Parameters)
-#  450|                 0: [Parameter] x
 #  451|         2: [LocalVariableDeclStmt] ... ...;
 #  451|           0: [LocalVariableDeclAndInitExpr] Func<Int32,Int32> f3 = ...
 #  451|             -1: [TypeMention] Func<Int32, Int32>
 #  451|               1: [TypeMention] int
 #  451|               2: [TypeMention] int
 #  451|             0: [LocalVariableAccess] access to local variable f3
 #  451|             1: [LambdaExpr] (...) => ...
-#  451|               0: [AddExpr] ... + ...
-#  451|                 0: [ParameterAccess] access to parameter x
-#  451|                 1: [IntLiteral] 1
 #-----|               2: (Parameters)
 #  451|                 0: [Parameter] x
 #  451|                   -1: [TypeMention] int
+#  451|               4: [AddExpr] ... + ...
+#  451|                 0: [ParameterAccess] access to parameter x
+#  451|                 1: [IntLiteral] 1
 #  452|         3: [LocalVariableDeclStmt] ... ...;
 #  452|           0: [LocalVariableDeclAndInitExpr] Func<Int32,String> f4 = ...
 #  452|             -1: [TypeMention] Func<Int32, String>
 #  452|               1: [TypeMention] int
 #  452|               2: [TypeMention] string
 #  452|             0: [LocalVariableAccess] access to local variable f4
 #  452|             1: [LambdaExpr] (...) => ...
-#  452|               0: [BlockStmt] {...}
+#-----|               2: (Parameters)
+#  452|                 0: [Parameter] x
+#  452|                   -1: [TypeMention] int
+#  452|               4: [BlockStmt] {...}
 #  452|                 0: [ReturnStmt] return ...;
 #  452|                   0: [AddExpr] ... + ...
 #  452|                     0: [CastExpr] (...) ...
 #  452|                       1: [ParameterAccess] access to parameter x
 #  452|                     1: [StringLiteral] ""
-#-----|               2: (Parameters)
-#  452|                 0: [Parameter] x
-#  452|                   -1: [TypeMention] int
 #  453|         4: [LocalVariableDeclStmt] ... ...;
 #  453|           0: [LocalVariableDeclAndInitExpr] S f5 = ...
 #  453|             -1: [TypeMention] S
 #  453|             0: [LocalVariableAccess] access to local variable f5
 #  453|             1: [LambdaExpr] (...) => ...
-#  453|               0: [MulExpr] ... * ...
-#  453|                 0: [ParameterAccess] access to parameter x
-#  453|                 1: [ParameterAccess] access to parameter y
 #-----|               2: (Parameters)
 #  453|                 0: [Parameter] x
 #  453|                 1: [Parameter] y
+#  453|               4: [MulExpr] ... * ...
+#  453|                 0: [ParameterAccess] access to parameter x
+#  453|                 1: [ParameterAccess] access to parameter y
 #  454|         5: [LocalVariableDeclStmt] ... ...;
 #  454|           0: [LocalVariableDeclAndInitExpr] Unit f6 = ...
 #  454|             -1: [TypeMention] Unit
 #  454|             0: [LocalVariableAccess] access to local variable f6
 #  454|             1: [LambdaExpr] (...) => ...
-#  454|               0: [MethodCall] call to method WriteLine
+#  454|               4: [MethodCall] call to method WriteLine
 #  454|                 -1: [TypeAccess] access to type Console
 #  454|                   0: [TypeMention] Console
 #  455|         6: [LocalVariableDeclStmt] ... ...;
@@ -2074,14 +2074,14 @@ expressions.cs:
 #  455|               2: [TypeMention] int
 #  455|             0: [LocalVariableAccess] access to local variable f7
 #  455|             1: [AnonymousMethodExpr] delegate(...) { ... }
-#  455|               0: [BlockStmt] {...}
+#-----|               2: (Parameters)
+#  455|                 0: [Parameter] x
+#  455|                   -1: [TypeMention] int
+#  455|               4: [BlockStmt] {...}
 #  455|                 0: [ReturnStmt] return ...;
 #  455|                   0: [AddExpr] ... + ...
 #  455|                     0: [ParameterAccess] access to parameter x
 #  455|                     1: [IntLiteral] 1
-#-----|               2: (Parameters)
-#  455|                 0: [Parameter] x
-#  455|                   -1: [TypeMention] int
 #  456|         7: [LocalVariableDeclStmt] ... ...;
 #  456|           0: [LocalVariableDeclAndInitExpr] Int32 j = ...
 #  456|             -1: [TypeMention] int
@@ -2093,7 +2093,7 @@ expressions.cs:
 #  457|               1: [TypeMention] int
 #  457|             0: [LocalVariableAccess] access to local variable f8
 #  457|             1: [AnonymousMethodExpr] delegate(...) { ... }
-#  457|               0: [BlockStmt] {...}
+#  457|               4: [BlockStmt] {...}
 #  457|                 0: [ReturnStmt] return ...;
 #  457|                   0: [AddExpr] ... + ...
 #  457|                     0: [LocalVariableAccess] access to local variable j
diff --git a/csharp/ql/test/library-tests/expressions/StripCasts.ql b/csharp/ql/test/library-tests/expressions/StripCasts.ql
@@ -1,5 +1,5 @@
 import csharp
 
 from Expr e, Expr stripped
-where stripped = e.stripCasts() and e != stripped
+where stripped = e.stripCasts() and e != stripped and e.fromSource()
 select e, stripped
diff --git a/csharp/ql/test/library-tests/goto/Goto1.ql b/csharp/ql/test/library-tests/goto/Goto1.ql
@@ -1,7 +1,10 @@
 import csharp
 
 query predicate edges(ControlFlow::Node node, ControlFlow::Node successor, string attr, string val) {
-  exists(ControlFlow::SuccessorType t | successor = node.getASuccessorByType(t) |
+  exists(ControlFlow::SuccessorType t |
+    successor = node.getASuccessorByType(t) and
+    (node.getElement().fromSource() or successor.getElement().fromSource())
+  |
     attr = "semmle.label" and
     val = t.toString()
   )
diff --git a/csharp/ql/test/library-tests/nullable/NullableExpressions.ql b/csharp/ql/test/library-tests/nullable/NullableExpressions.ql
@@ -1,5 +1,5 @@
 import csharp
 
 from Expr e, Location loc
-where e.getLocation() = loc
+where e.getLocation() = loc and e.fromSource()
 select loc.getStartLine(), loc.getStartColumn(), e.getParent(), e, e.getType().toString()
diff --git a/csharp/ql/test/library-tests/standalone/controlflow/cfg.ql b/csharp/ql/test/library-tests/standalone/controlflow/cfg.ql
@@ -17,4 +17,6 @@ class UnknownLocalVariableDeclExpr extends LocalVariableDeclAndInitExpr {
   override string toString() { result = "(unknown type) " + this.getName() }
 }
 
-query predicate edges(ControlFlow::Node n1, ControlFlow::Node n2) { n2 = n1.getASuccessor() }
+query predicate edges(ControlFlow::Node n1, ControlFlow::Node n2) {
+  n2 = n1.getASuccessor() and n1.getLocation().getFile().fromSource()
+}
diff --git a/csharp/ql/test/query-tests/Stubs/MinimalStubsFromSource.expected b/csharp/ql/test/query-tests/Stubs/MinimalStubsFromSource.expected

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import csharp`
`2`	`2`
`3`	`3`	`query predicate countSplits(ControlFlowElement cfe, int i) {`
`4`		`- i = strictcount(ControlFlow::Nodes::ElementNode n \| n.getElement() = cfe)`
	`4`	`+ i = strictcount(ControlFlow::Nodes::ElementNode n \| n.getElement() = cfe and cfe.fromSource())`
`5`	`5`	`}`
`6`	`6`
`7`		`-query predicate ssaDef(Ssa::Definition def) { any() }`
	`7`	`+query predicate ssaDef(Ssa::Definition def) { def.getLocation().getFile().fromSource() }`