Merge pull request #2684 from geoffw0/rearrange-tests

CPP: Test cleanup

Author: jbj

cpp/ql/test/library-tests/controlflow/stackvariablereachability/StackVariableReachabilityWithReassignment.expected

@@ -0,0 +1,13 @@
+| stackVariableReachability.c:11:2:11:2 | a | ... + ... |
+| stackVariableReachability.c:11:6:11:6 | a | 10 |
+| stackVariableReachability.c:12:2:12:2 | a | 40 |
+| stackVariableReachability.c:13:2:13:2 | a | 40 |
+| stackVariableReachability.c:14:4:14:4 | a | 40 |
+| stackVariableReachability.c:15:2:15:2 | a | call to f |
+| stackVariableReachability.c:15:8:15:8 | a | 40 |
+| stackVariableReachability.c:16:2:16:2 | a | call to f |
+| stackVariableReachability.c:19:3:19:3 | b | 50 |
+| stackVariableReachability.c:21:3:21:3 | b | 60 |
+| stackVariableReachability.c:23:2:23:2 | c | b |
+| stackVariableReachability.c:23:6:23:6 | b | 50, 60 |
+| stackVariableReachability.c:24:2:24:2 | c | 50, 60, b |

cpp/ql/test/library-tests/controlflow/stackvariablereachability/StackVariableReachabilityWithReassignment.ql

@@ -0,0 +1,19 @@
+import cpp
+import semmle.code.cpp.controlflow.StackVariableReachability
+
+class MyStackVariableReachability extends StackVariableReachabilityWithReassignment {
+  MyStackVariableReachability() { this = "MyStackVariableReachability" }
+
+  override predicate isSourceActual(ControlFlowNode node, StackVariable v) {
+    exprDefinition(v, _, node)
+  }
+
+  override predicate isSinkActual(ControlFlowNode node, StackVariable v) {
+    node.(VariableAccess).getTarget() = v
+  }
+
+  override predicate isBarrier(ControlFlowNode node, StackVariable v) { exprDefinition(v, _, node) }
+}
+
+from MyStackVariableReachability svr, ControlFlowNode sink
+select sink, strictconcat(Expr source | svr.reaches(source, _, sink) | source.toString(), ", ")

cpp/ql/test/library-tests/controlflow/stackvariablereachability/stackVariableReachability.c

@@ -0,0 +1,25 @@
+
+int cond();
+int f(int x);
+
+void test(int p)
+{
+	int a = 10;
+	int b = 20;
+	int c = 30;
+
+	a = a + 1;
+	a = 40;
+	a++;
+	++a;
+	a = f(a);
+	a;
+
+	if (cond()) {
+		b = 50;
+	} else {
+		b = 60;
+	}
+	c = b;
+	c;
+}

cpp/ql/test/library-tests/controlflow/stackvariablereachability/stackVariableReachability.expected

@@ -0,0 +1,13 @@
+| stackVariableReachability.c:11:2:11:2 | a | ... + ... |
+| stackVariableReachability.c:11:6:11:6 | a | 10 |
+| stackVariableReachability.c:12:2:12:2 | a | 40 |
+| stackVariableReachability.c:13:2:13:2 | a | 40 |
+| stackVariableReachability.c:14:4:14:4 | a | 40 |
+| stackVariableReachability.c:15:2:15:2 | a | call to f |
+| stackVariableReachability.c:15:8:15:8 | a | 40 |
+| stackVariableReachability.c:16:2:16:2 | a | call to f |
+| stackVariableReachability.c:19:3:19:3 | b | 50 |
+| stackVariableReachability.c:21:3:21:3 | b | 60 |
+| stackVariableReachability.c:23:2:23:2 | c | b |
+| stackVariableReachability.c:23:6:23:6 | b | 50, 60 |
+| stackVariableReachability.c:24:2:24:2 | c | b |

cpp/ql/test/library-tests/controlflow/stackvariablereachability/stackVariableReachability.ql

@@ -0,0 +1,17 @@
+import cpp
+import semmle.code.cpp.controlflow.StackVariableReachability
+
+class MyStackVariableReachability extends StackVariableReachability {
+  MyStackVariableReachability() { this = "MyStackVariableReachability" }
+
+  override predicate isSource(ControlFlowNode node, StackVariable v) { exprDefinition(v, _, node) }
+
+  override predicate isSink(ControlFlowNode node, StackVariable v) {
+    node.(VariableAccess).getTarget() = v
+  }
+
+  override predicate isBarrier(ControlFlowNode node, StackVariable v) { exprDefinition(v, _, node) }
+}
+
+from MyStackVariableReachability svr, ControlFlowNode sink
+select sink, strictconcat(Expr source | svr.reaches(source, _, sink) | source.toString(), ", ")