Merge pull request #2061 from hvitved/csharp/local-function-label

calumgrant · web-flow · commit b4da63b3f2f7 · 2019-10-01T15:19:04.000+01:00
C#: Prepend enclosing method in local function TRAP labels
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalFunction.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalFunction.cs
@@ -11,9 +11,17 @@ class LocalFunction : Method
         {
         }
 
+        Method ContainingMethod =>
+            symbol.OriginalDefinition.ContainingSymbol is IMethodSymbol m
+            ? Method.Create(Context, m)
+            : throw new InternalError(symbol, "Unable to determine local function's containing callable");
+
         public override void WriteId(TextWriter trapFile)
         {
+            trapFile.WriteSubId(ContainingMethod);
+            trapFile.Write(".(");
             trapFile.WriteSubId(Location);
+            trapFile.Write(')');
             if (symbol.IsGenericMethod && !IsSourceDeclaration)
             {
                 trapFile.Write('<');
@@ -41,7 +49,7 @@ public override void Populate(TextWriter trapFile)
             // the "static" modifier is present.
             if (symbol.DeclaringSyntaxReferences.SingleOrDefault().GetSyntax() is LocalFunctionStatementSyntax fn)
             {
-                foreach(var modifier in fn.Modifiers)
+                foreach (var modifier in fn.Modifiers)
                 {
                     Modifier.HasModifier(Context, trapFile, this, modifier.Text);
                 }
diff --git a/csharp/ql/test/library-tests/csharp7/CSharp7.cs b/csharp/ql/test/library-tests/csharp7/CSharp7.cs
@@ -162,7 +162,7 @@ void Generics()
 
         U h<T, U>(T t, U u)
         {
-            int f2() => f<T>();
+            int f2<S>(S s, T _t) => f<T>();
             f<T>();
             return g(u);
         }
diff --git a/csharp/ql/test/library-tests/csharp7/ExpressionBodies.expected b/csharp/ql/test/library-tests/csharp7/ExpressionBodies.expected
@@ -12,7 +12,7 @@
 | CSharp7.cs:152:13:152:26 | f9 | CSharp7.cs:152:25:152:25 | 0 |
 | CSharp7.cs:160:9:160:24 | f | CSharp7.cs:160:23:160:23 | 1 |
 | CSharp7.cs:161:9:161:25 | g | CSharp7.cs:161:24:161:24 | access to parameter t |
-| CSharp7.cs:165:13:165:31 | f2 | CSharp7.cs:165:25:165:30 | call to local function f |
+| CSharp7.cs:165:13:165:43 | f2 | CSharp7.cs:165:37:165:42 | call to local function f |
 | CSharp7.cs:177:9:177:40 | f | CSharp7.cs:177:31:177:39 | ... + ... |
 | CSharp7.cs:178:9:178:32 | g | CSharp7.cs:178:31:178:31 | access to parameter s |
 | CSharp7.cs:284:32:284:61 | (...) => ... | CSharp7.cs:284:40:284:61 | (..., ...) |
diff --git a/csharp/ql/test/library-tests/csharp7/LocalFunctionCalls.expected b/csharp/ql/test/library-tests/csharp7/LocalFunctionCalls.expected
@@ -3,7 +3,7 @@
 | CSharp7.cs:147:30:147:34 | call to local function f7 | CSharp7.cs:143:9:143:31 | f7 | CSharp7.cs:143:9:143:31 | f7 |
 | CSharp7.cs:148:20:148:24 | call to local function f9 | CSharp7.cs:147:13:147:35 | f9 | CSharp7.cs:147:13:147:35 | f9 |
 | CSharp7.cs:155:16:155:20 | call to local function f1 | CSharp7.cs:131:9:131:39 | f1 | CSharp7.cs:131:9:131:39 | f1 |
-| CSharp7.cs:165:25:165:30 | call to local function f | CSharp7.cs:160:9:160:24 | f | CSharp7.cs:160:9:160:24 | f |
+| CSharp7.cs:165:37:165:42 | call to local function f | CSharp7.cs:160:9:160:24 | f | CSharp7.cs:160:9:160:24 | f |
 | CSharp7.cs:166:13:166:18 | call to local function f | CSharp7.cs:160:9:160:24 | f | CSharp7.cs:160:9:160:24 | f |
 | CSharp7.cs:167:20:167:23 | call to local function g | CSharp7.cs:161:9:161:25 | g | CSharp7.cs:161:9:161:25 | g |
 | CSharp7.cs:170:9:170:15 | call to local function h | CSharp7.cs:163:9:168:9 | h | CSharp7.cs:163:9:168:9 | h |
diff --git a/csharp/ql/test/library-tests/csharp7/LocalFunctionParameters.expected b/csharp/ql/test/library-tests/csharp7/LocalFunctionParameters.expected
@@ -12,6 +12,8 @@
 | CSharp7.cs:163:9:168:9 | h | 1 | CSharp7.cs:163:26:163:26 | u | Boolean |
 | CSharp7.cs:163:9:168:9 | h | 1 | CSharp7.cs:163:26:163:26 | u | Int32 |
 | CSharp7.cs:163:9:168:9 | h | 1 | CSharp7.cs:163:26:163:26 | u | U |
+| CSharp7.cs:165:13:165:43 | f2 | 0 | CSharp7.cs:165:25:165:25 | s | S |
+| CSharp7.cs:165:13:165:43 | f2 | 1 | CSharp7.cs:165:30:165:31 | _t | T |
 | CSharp7.cs:177:9:177:40 | f | 0 | CSharp7.cs:177:25:177:25 | s | String |
 | CSharp7.cs:178:9:178:32 | g | 0 | CSharp7.cs:178:25:178:25 | s | String |
 | CSharp7.cs:179:9:179:40 | h | 0 | CSharp7.cs:179:25:179:25 | s | String |
diff --git a/csharp/ql/test/library-tests/csharp7/LocalFunctionStmts.expected b/csharp/ql/test/library-tests/csharp7/LocalFunctionStmts.expected
@@ -9,7 +9,7 @@
 | CSharp7.cs:160:9:160:24 | f(...) | CSharp7.cs:160:9:160:24 | f |
 | CSharp7.cs:161:9:161:25 | g(...) | CSharp7.cs:161:9:161:25 | g |
 | CSharp7.cs:163:9:168:9 | h(...) | CSharp7.cs:163:9:168:9 | h |
-| CSharp7.cs:165:13:165:31 | f2(...) | CSharp7.cs:165:13:165:31 | f2 |
+| CSharp7.cs:165:13:165:43 | f2(...) | CSharp7.cs:165:13:165:43 | f2 |
 | CSharp7.cs:177:9:177:40 | f(...) | CSharp7.cs:177:9:177:40 | f |
 | CSharp7.cs:178:9:178:32 | g(...) | CSharp7.cs:178:9:178:32 | g |
 | CSharp7.cs:179:9:179:40 | h(...) | CSharp7.cs:179:9:179:40 | h |
diff --git a/csharp/ql/test/library-tests/csharp7/LocalFunctions.expected b/csharp/ql/test/library-tests/csharp7/LocalFunctions.expected
@@ -13,7 +13,7 @@
 | CSharp7.cs:163:9:168:9 | h | h | Boolean | CSharp7.cs:159:5:172:5 | {...} | CSharp7.cs:163:9:168:9 | h(...) | h(string, bool) |
 | CSharp7.cs:163:9:168:9 | h | h | Int32 | CSharp7.cs:159:5:172:5 | {...} | CSharp7.cs:163:9:168:9 | h(...) | h(int, int) |
 | CSharp7.cs:163:9:168:9 | h | h | U | CSharp7.cs:159:5:172:5 | {...} | CSharp7.cs:163:9:168:9 | h(...) | h(T, U) |
-| CSharp7.cs:165:13:165:31 | f2 | f2 | Int32 | CSharp7.cs:164:9:168:9 | {...} | CSharp7.cs:165:13:165:31 | f2(...) | f2() |
+| CSharp7.cs:165:13:165:43 | f2 | f2 | Int32 | CSharp7.cs:164:9:168:9 | {...} | CSharp7.cs:165:13:165:43 | f2(...) | f2(S, T) |
 | CSharp7.cs:177:9:177:40 | f | f | String | CSharp7.cs:175:5:184:5 | {...} | CSharp7.cs:177:9:177:40 | f(...) | f(string) |
 | CSharp7.cs:178:9:178:32 | g | g | String | CSharp7.cs:175:5:184:5 | {...} | CSharp7.cs:178:9:178:32 | g(...) | g(string) |
 | CSharp7.cs:179:9:179:40 | h | h | String | CSharp7.cs:175:5:184:5 | {...} | CSharp7.cs:179:9:179:40 | h(...) | h(string) |
diff --git a/csharp/ql/test/library-tests/csharp7/UnboundLocalFunctions.expected b/csharp/ql/test/library-tests/csharp7/UnboundLocalFunctions.expected
@@ -4,3 +4,4 @@
 | CSharp7.cs:161:9:161:25 | g | 0 | CSharp7.cs:161:13:161:13 | T |
 | CSharp7.cs:163:9:168:9 | h | 0 | CSharp7.cs:163:13:163:13 | T |
 | CSharp7.cs:163:9:168:9 | h | 1 | CSharp7.cs:163:16:163:16 | U |
+| CSharp7.cs:165:13:165:43 | f2 | 0 | CSharp7.cs:165:20:165:20 | S |

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,17 @@ class LocalFunction : Method`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
	`14`	`+ Method ContainingMethod =>`
	`15`	`+ symbol.OriginalDefinition.ContainingSymbol is IMethodSymbol m`
	`16`	`+ ? Method.Create(Context, m)`
	`17`	`+ : throw new InternalError(symbol, "Unable to determine local function's containing callable");`
	`18`	`+`
`14`	`19`	`public override void WriteId(TextWriter trapFile)`
`15`	`20`	`{`
	`21`	`+ trapFile.WriteSubId(ContainingMethod);`
	`22`	`+ trapFile.Write(".(");`
`16`	`23`	`trapFile.WriteSubId(Location);`
	`24`	`+ trapFile.Write(')');`
`17`	`25`	`if (symbol.IsGenericMethod && !IsSourceDeclaration)`
`18`	`26`	`{`
`19`	`27`	`trapFile.Write('<');`
`@@ -41,7 +49,7 @@ public override void Populate(TextWriter trapFile)`
`41`	`49`	`// the "static" modifier is present.`
`42`	`50`	`if (symbol.DeclaringSyntaxReferences.SingleOrDefault().GetSyntax() is LocalFunctionStatementSyntax fn)`
`43`	`51`	`{`
`44`		`- foreach(var modifier in fn.Modifiers)`
	`52`	`+ foreach (var modifier in fn.Modifiers)`
`45`	`53`	`{`
`46`	`54`	`Modifier.HasModifier(Context, trapFile, this, modifier.Text);`
`47`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ void Generics()`
`162`	`162`
`163`	`163`	`U h<T, U>(T t, U u)`
`164`	`164`	`{`
`165`		`- int f2() => f<T>();`
	`165`	`+ int f2<S>(S s, T _t) => f<T>();`
`166`	`166`	`f<T>();`
`167`	`167`	`return g(u);`
`168`	`168`	`}`