C#: Exclude assembly attribute expressions from CFG construction

hvitved · tamasvajk · commit 91dd67798ab1 · 2020-11-11T09:50:59.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/controlflow/internal/Splitting.qll b/csharp/ql/src/semmle/code/csharp/controlflow/internal/Splitting.qll
@@ -1462,7 +1462,11 @@ predicate succEntrySplits(
   exists(int rnk |
     succ = succEntry(pred) and
     t instanceof NormalSuccessor and
-    succEntrySplitsFromRank(pred, succ, succSplits, rnk)
+    succEntrySplitsFromRank(pred, succ, succSplits, rnk) and
+    // Attribute arguments in assemblies are represented as expressions, even though
+    // they are not from source. We are not interested in constructing a CFG for such
+    // expressions.
+    succ.fromSource()
   |
     rnk = 0 and
     not any(SplitInternal split).hasEntry(pred, succ)
diff --git a/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.ql b/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.ql
@@ -2,5 +2,4 @@ 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
@@ -3,22 +3,16 @@ import Common
 
 query predicate dominance(SourceControlFlowNode dom, SourceControlFlowNode node) {
   dom.strictlyDominates(node) and
-  dom.getASuccessor() = node and
-  dom.getLocation().getFile().fromSource()
+  dom.getASuccessor() = node
 }
 
 query predicate postDominance(SourceControlFlowNode dom, SourceControlFlowNode node) {
   dom.strictlyPostDominates(node) and
-  dom.getAPredecessor() = node and
-  dom.getLocation().getFile().fromSource()
+  dom.getAPredecessor() = node
 }
 
-query predicate blockDominance(SourceBasicBlock dom, SourceBasicBlock bb) {
-  dom.dominates(bb) and
-  dom.getLocation().getFile().fromSource()
-}
+query predicate blockDominance(SourceBasicBlock dom, SourceBasicBlock bb) { dom.dominates(bb) }
 
 query predicate postBlockDominance(SourceBasicBlock dom, SourceBasicBlock bb) {
-  dom.postDominates(bb) and
-  dom.getLocation().getFile().fromSource()
+  dom.postDominates(bb)
 }
diff --git a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql
@@ -4,10 +4,7 @@ import Common
 query predicate edges(
   SourceControlFlowNode node, SourceControlFlowNode successor, string attr, string val
 ) {
-  exists(ControlFlow::SuccessorType t |
-    successor = node.getASuccessorByType(t) and
-    (node.getElement().fromSource() or successor.getElement().fromSource())
-  |
+  exists(ControlFlow::SuccessorType t | successor = node.getASuccessorByType(t) |
     attr = "semmle.label" and
     val = t.toString()
   )
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 and cfe.fromSource())
+  i = strictcount(ControlFlow::Nodes::ElementNode n | n.getElement() = cfe)
 }
 
-query predicate ssaDef(Ssa::Definition def) { def.getLocation().getFile().fromSource() }
+query predicate ssaDef(Ssa::Definition def) { any() }
diff --git a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql
@@ -2,7 +2,5 @@ import csharp
 import semmle.code.csharp.dataflow.TaintTracking
 
 from DataFlow::Node pred, DataFlow::Node succ
-where
-  TaintTracking::localTaintStep(pred, succ) and
-  pred.getLocation().getFile().fromSource()
+where TaintTracking::localTaintStep(pred, succ)
 select pred, succ
diff --git a/csharp/ql/test/library-tests/csharp7/TaintReaches.ql b/csharp/ql/test/library-tests/csharp7/TaintReaches.ql
@@ -2,7 +2,5 @@ import csharp
 import semmle.code.csharp.dataflow.TaintTracking
 
 from StringLiteral l, DataFlow::Node n
-where
-  TaintTracking::localTaintStep+(DataFlow::exprNode(l), n) and
-  n.getLocation().getFile().fromSource()
+where TaintTracking::localTaintStep+(DataFlow::exprNode(l), n)
 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,7 +1,5 @@
 import csharp
 
 from DataFlow::Node pred, DataFlow::Node succ
-where
-  DataFlow::localFlowStep(pred, succ) and
-  pred.getLocation().getFile().fromSource()
+where DataFlow::localFlowStep(pred, succ)
 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,7 +1,5 @@
 import csharp
 
 from DataFlow::Node pred, DataFlow::Node succ
-where
-  TaintTracking::localTaintStep(pred, succ) and
-  pred.getLocation().getFile().fromSource()
+where TaintTracking::localTaintStep(pred, succ)
 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) and e.getExpr().fromSource()
+where exprModulus(e, b, delta, mod)
 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,5 +18,4 @@ 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/goto/Goto1.ql b/csharp/ql/test/library-tests/goto/Goto1.ql
@@ -1,10 +1,7 @@
 import csharp
 
 query predicate edges(ControlFlow::Node node, ControlFlow::Node successor, string attr, string val) {
-  exists(ControlFlow::SuccessorType t |
-    successor = node.getASuccessorByType(t) and
-    (node.getElement().fromSource() or successor.getElement().fromSource())
-  |
+  exists(ControlFlow::SuccessorType t | successor = node.getASuccessorByType(t) |
     attr = "semmle.label" and
     val = t.toString()
   )
diff --git a/csharp/ql/test/library-tests/standalone/controlflow/cfg.ql b/csharp/ql/test/library-tests/standalone/controlflow/cfg.ql
@@ -17,6 +17,4 @@ class UnknownLocalVariableDeclExpr extends LocalVariableDeclAndInitExpr {
   override string toString() { result = "(unknown type) " + this.getName() }
 }
 
-query predicate edges(ControlFlow::Node n1, ControlFlow::Node n2) {
-  n2 = n1.getASuccessor() and n1.getLocation().getFile().fromSource()
-}
+query predicate edges(ControlFlow::Node n1, ControlFlow::Node n2) { n2 = n1.getASuccessor() }

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 and cfe.fromSource())`
	`4`	`+ i = strictcount(ControlFlow::Nodes::ElementNode n \| n.getElement() = cfe)`
`5`	`5`	`}`
`6`	`6`
`7`		`-query predicate ssaDef(Ssa::Definition def) { def.getLocation().getFile().fromSource() }`
	`7`	`+query predicate ssaDef(Ssa::Definition def) { any() }`