C#: Add dynamic casts to useless upcast test

tamasvajk · tamasvajk · commit 422c2d5ccb86 · 2022-02-21T16:10:00.000+01:00
diff --git a/csharp/ql/src/Language Abuse/UselessUpcast.ql b/csharp/ql/src/Language Abuse/UselessUpcast.ql
@@ -207,6 +207,17 @@ class ExplicitUpcast extends ExplicitCast {
   }
 }
 
+// Stop external filepaths from appearing in the results
+class ValueOrRefTypeLocation extends ValueOrRefType {
+  override predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) {
+    exists(string fullPath | super.hasLocationInfo(fullPath, sl, sc, el, ec) |
+      if exists(this.getFile().getRelativePath())
+      then path = fullPath
+      else path = fullPath.regexpReplaceAll(".*/", "<external>/")
+    )
+  }
+}
+
 from ExplicitUpcast u, ValueOrRefType src, ValueOrRefType dest
 where
   src = u.getSourceType() and
diff --git a/csharp/ql/test/query-tests/Language Abuse/UselessUpcast/UselessUpcast.cs b/csharp/ql/test/query-tests/Language Abuse/UselessUpcast/UselessUpcast.cs
@@ -17,8 +17,8 @@ public void M(A a) { }
 
 class B : A
 {
-    public static bool operator==(B b1, B b2) { return false; }
-    public static bool operator!=(B b1, B b2) { return true; }
+    public static bool operator ==(B b1, B b2) { return false; }
+    public static bool operator !=(B b1, B b2) { return true; }
     public void M(B b) { }
 }
 
@@ -68,11 +68,11 @@ void Test1(string[] args)
 
         ((I2)a).Foo(); // GOOD: Cast to an interface
 
-        o = a==(A)b; // GOOD: EQExpr
+        o = a == (A)b; // GOOD: EQExpr
 
-        o = b==(B)b; // GOOD: Operator call
+        o = b == (B)b; // GOOD: Operator call
 
-        var act = (Action) (() => { }); // GOOD
+        var act = (Action)(() => { }); // GOOD
 
         var objects = args.Select(arg => (object)arg); // GOOD
 
@@ -126,9 +126,9 @@ public static void M2(this I3 i) =>
 
 static class StaticMethods
 {
-   public static void M1(A _) { }
-   public static void M1(B _) { }
-   public static void M2(B _) { }
+    public static void M1(A _) { }
+    public static void M1(B _) { }
+    public static void M2(B _) { }
 }
 
 class Constructors : I2
@@ -162,4 +162,12 @@ void M(SubSub ss)
             new Sub((Sub)ss); // BAD
         }
     }
+
+    class Dynamic
+    {
+        void M(object o)
+        {
+            var s0 = ((dynamic)o).ToString(); // GOOD
+        }
+    }
 }
diff --git a/csharp/ql/test/query-tests/Language Abuse/UselessUpcast/UselessUpcast.expected b/csharp/ql/test/query-tests/Language Abuse/UselessUpcast/UselessUpcast.expected
@@ -6,4 +6,5 @@
 | UselessUpcast.cs:103:16:103:19 | (...) ... | There is no need to upcast from $@ to $@ - the conversion can be done implicitly. | UselessUpcast.cs:25:7:25:7 | C | C | UselessUpcast.cs:18:7:18:7 | B | B |
 | UselessUpcast.cs:158:34:158:40 | (...) ... | There is no need to upcast from $@ to $@ - the conversion can be done implicitly. | UselessUpcast.cs:156:11:156:16 | SubSub | SubSub | UselessUpcast.cs:151:11:151:13 | Sub | Sub |
 | UselessUpcast.cs:162:21:162:27 | (...) ... | There is no need to upcast from $@ to $@ - the conversion can be done implicitly. | UselessUpcast.cs:156:11:156:16 | SubSub | SubSub | UselessUpcast.cs:151:11:151:13 | Sub | Sub |
+| UselessUpcast.cs:170:23:170:32 | (...) ... | There is no need to upcast from $@ to $@ - the conversion can be done implicitly. | file://<external>/System.Private.CoreLib.dll:0:0:0:0 | Object | Object | file://<external>/System.Private.CoreLib.dll:0:0:0:0 | dynamic | dynamic |
 | UselessUpcastBad.cs:9:23:9:32 | (...) ... | There is no need to upcast from $@ to $@ - the conversion can be done implicitly. | UselessUpcastBad.cs:4:11:4:13 | Sub | Sub | UselessUpcastBad.cs:3:11:3:15 | Super | Super |

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public void M(A a) { }`
`17`	`17`
`18`	`18`	`class B : A`
`19`	`19`	`{`
`20`		`- public static bool operator==(B b1, B b2) { return false; }`
`21`		`- public static bool operator!=(B b1, B b2) { return true; }`
	`20`	`+ public static bool operator ==(B b1, B b2) { return false; }`
	`21`	`+ public static bool operator !=(B b1, B b2) { return true; }`
`22`	`22`	`public void M(B b) { }`
`23`	`23`	`}`
`24`	`24`
`@@ -68,11 +68,11 @@ void Test1(string[] args)`
`68`	`68`
`69`	`69`	`((I2)a).Foo(); // GOOD: Cast to an interface`
`70`	`70`
`71`		`- o = a==(A)b; // GOOD: EQExpr`
	`71`	`+ o = a == (A)b; // GOOD: EQExpr`
`72`	`72`
`73`		`- o = b==(B)b; // GOOD: Operator call`
	`73`	`+ o = b == (B)b; // GOOD: Operator call`
`74`	`74`
`75`		`- var act = (Action) (() => { }); // GOOD`
	`75`	`+ var act = (Action)(() => { }); // GOOD`
`76`	`76`
`77`	`77`	`var objects = args.Select(arg => (object)arg); // GOOD`
`78`	`78`
`@@ -126,9 +126,9 @@ public static void M2(this I3 i) =>`
`126`	`126`
`127`	`127`	`static class StaticMethods`
`128`	`128`	`{`
`129`		`- public static void M1(A _) { }`
`130`		`- public static void M1(B _) { }`
`131`		`- public static void M2(B _) { }`
	`129`	`+ public static void M1(A _) { }`
	`130`	`+ public static void M1(B _) { }`
	`131`	`+ public static void M2(B _) { }`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`class Constructors : I2`
`@@ -162,4 +162,12 @@ void M(SubSub ss)`
`162`	`162`	`new Sub((Sub)ss); // BAD`
`163`	`163`	`}`
`164`	`164`	`}`
	`165`	`+`
	`166`	`+ class Dynamic`
	`167`	`+ {`
	`168`	`+ void M(object o)`
	`169`	`+ {`
	`170`	`+ var s0 = ((dynamic)o).ToString(); // GOOD`
	`171`	`+ }`
	`172`	`+ }`
`165`	`173`	`}`