C#: Adapt to new Roslyn representation of implicit Main methods

hvitved · tamasvajk · commit 0a0657ada1af · 2021-12-10T10:42:29.000+01:00
diff --git a/csharp/ql/lib/semmle/code/csharp/Stmt.qll b/csharp/ql/lib/semmle/code/csharp/Stmt.qll
@@ -75,7 +75,7 @@ class BlockStmt extends Stmt, @block_stmt {
 
   /** Holds if this block is the container of the global statements. */
   predicate isGlobalStatementContainer() {
-    this.getEnclosingCallable().hasQualifiedName("<Program>$.<Main>$")
+    this.getEnclosingCallable().hasQualifiedName("Program.<Main>$")
   }
 
   override Stmt stripSingletonBlocks() {
diff --git a/csharp/ql/lib/semmle/code/csharp/commons/Util.qll b/csharp/ql/lib/semmle/code/csharp/commons/Util.qll
@@ -8,7 +8,7 @@ class MainMethod extends Method {
     (
       this.hasName("Main")
       or
-      this.hasQualifiedName("<Program>$", "<Main>$")
+      this.hasQualifiedName("Program.<Main>$")
     ) and
     this.isStatic() and
     (this.getReturnType() instanceof VoidType or this.getReturnType() instanceof IntType) and

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class BlockStmt extends Stmt, @block_stmt {`
`75`	`75`
`76`	`76`	`/** Holds if this block is the container of the global statements. */`
`77`	`77`	`predicate isGlobalStatementContainer() {`
`78`		`- this.getEnclosingCallable().hasQualifiedName("<Program>$.<Main>$")`
	`78`	`+ this.getEnclosingCallable().hasQualifiedName("Program.<Main>$")`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`override Stmt stripSingletonBlocks() {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class MainMethod extends Method {`
`8`	`8`	`(`
`9`	`9`	`this.hasName("Main")`
`10`	`10`	`or`
`11`		`- this.hasQualifiedName("<Program>$", "<Main>$")`
	`11`	`+ this.hasQualifiedName("Program.<Main>$")`
`12`	`12`	`) and`
`13`	`13`	`this.isStatic() and`
`14`	`14`	`(this.getReturnType() instanceof VoidType or this.getReturnType() instanceof IntType) and`