C#: Address review comments

Author: hvitved

change-notes/1.19/analysis-csharp.md

@@ -4,7 +4,7 @@
 
 * Control flow graph improvements:
   * The control flow graph construction now takes simple Boolean conditions on local scope variables into account. For example, in `if (b) x = 0; if (b) x = 1;`, the control flow graph will reflect that taking the `true` (resp. `false`) branch in the first condition implies taking the same branch in the second condition. In effect, the first assignment to `x` will now be identified as being dead.
-  * Constant failing assertions, such as `Debug.Assert(false)`, are now taken into account. Syntactic successors of constant failing assertions are consequently dead code.
+  * Code that is only reachable from a constant failing assertion, such as `Debug.Assert(false)`, is considered to be unreachable.
 
 ## New queries
 

csharp/ql/src/semmle/code/csharp/commons/Assertions.qll

@@ -9,7 +9,7 @@ abstract class AssertMethod extends Method {
   abstract int getAssertionIndex();
 
   /** Gets the parameter being asserted. */
-  final Parameter getAssertionParameter() {
+  final Parameter getAssertedParameter() {
     result = this.getParameter(this.getAssertionIndex())
   }
 
@@ -44,7 +44,7 @@ class Assertion extends MethodCall {
 
   /** Gets the expression that this assertion pertains to. */
   Expr getExpr() {
-    result = this.getArgumentForParameter(target.getAssertionParameter())
+    result = this.getArgumentForParameter(target.getAssertedParameter())
   }
 }
 
@@ -55,10 +55,10 @@ class FailingAssertion extends Assertion {
       am = this.getAssertMethod() and
       e = this.getExpr() |
       am instanceof AssertTrueMethod and
-      e.(BoolLiteral).getBoolValue() = false
+      e.getValue() = "false"
       or
       am instanceof AssertFalseMethod and
-      e.(BoolLiteral).getBoolValue() = true
+      e.getValue() = "true"
     )
   }
 }

csharp/ql/test/library-tests/controlflow/graph/Common.qll

@@ -1,25 +1,25 @@
 import csharp
 
-class Stub extends File {
-  Stub() {
+class StubFile extends File {
+  StubFile() {
     this.getAbsolutePath().matches("%resources/stubs/%")
   }
 }
 
 class SourceControlFlowElement extends ControlFlowElement {
   SourceControlFlowElement() {
-    not this.getLocation().getFile() instanceof Stub
+    not this.getLocation().getFile() instanceof StubFile
   }
 }
 
 class SourceControlFlowNode extends ControlFlow::Node {
   SourceControlFlowNode() {
-    not this.getLocation().getFile() instanceof Stub
+    not this.getLocation().getFile() instanceof StubFile
   }
 }
 
 class SourceBasicBlock extends ControlFlow::BasicBlock {
   SourceBasicBlock() {
-    not this.getLocation().getFile() instanceof Stub
+    not this.getLocation().getFile() instanceof StubFile
   }
 }