Merge pull request #7550 from michaelnebel/csharp/global-using

C#: Support for identifying whether a using directive is "global".

Author: hvitved

csharp/downgrades/193c35b0e3776f8ee9a49e984e393974b4c670f6/old.dbscheme

@@ -0,0 +1,3 @@
+description: Remove 'using_global' relation.
+compatibility: backwards
+using_global.rel: delete

csharp/downgrades/193c35b0e3776f8ee9a49e984e393974b4c670f6/semmlecode.csharp.dbscheme

@@ -0,0 +1,5 @@
+name: codeql/csharp-downgrades
+groups: csharp
+version: 0.0.6-dev
+downgrades: .
+library: true

csharp/downgrades/193c35b0e3776f8ee9a49e984e393974b4c670f6/upgrade.properties

@@ -47,6 +47,11 @@ protected override void Populate(TextWriter trapFile)
                 trapFile.using_directive_location(this, Context.CreateLocation(ReportingLocation));
             }
 
+            if (node.GlobalKeyword.Kind() == SyntaxKind.GlobalKeyword)
+            {
+                trapFile.using_global(this);
+            }
+
             if (parent is not null)
             {
                 trapFile.parent_namespace_declaration(this, parent);

csharp/downgrades/qlpack.yml

@@ -68,19 +68,19 @@ public static string GetName(this ISymbol symbol, bool useMetadataName = false)
             return symbol.CanBeReferencedByName ? name : name.Substring(symbol.Name.LastIndexOf('.') + 1);
         }
 
+        private static IEnumerable<SyntaxToken> GetModifiers<T>(this ISymbol symbol, Func<T, IEnumerable<SyntaxToken>> getModifierTokens) =>
+            symbol.DeclaringSyntaxReferences
+                .Select(r => r.GetSyntax())
+                .OfType<T>()
+                .SelectMany(getModifierTokens);
+
         /// <summary>
         /// Gets the source-level modifiers belonging to this symbol, if any.
         /// </summary>
         public static IEnumerable<string> GetSourceLevelModifiers(this ISymbol symbol)
         {
-            var methodModifiers = symbol.DeclaringSyntaxReferences
-                .Select(r => r.GetSyntax())
-                .OfType<Microsoft.CodeAnalysis.CSharp.Syntax.BaseMethodDeclarationSyntax>()
-                .SelectMany(md => md.Modifiers);
-            var typeModifers = symbol.DeclaringSyntaxReferences
-                .Select(r => r.GetSyntax())
-                .OfType<Microsoft.CodeAnalysis.CSharp.Syntax.TypeDeclarationSyntax>()
-                .SelectMany(cd => cd.Modifiers);
+            var methodModifiers = symbol.GetModifiers<Microsoft.CodeAnalysis.CSharp.Syntax.BaseMethodDeclarationSyntax>(md => md.Modifiers);
+            var typeModifers = symbol.GetModifiers<Microsoft.CodeAnalysis.CSharp.Syntax.TypeDeclarationSyntax>(cd => cd.Modifiers);
             return methodModifiers.Concat(typeModifers).Select(m => m.Text);
         }
 
@@ -277,10 +277,8 @@ private static void BuildAssembly(IAssemblySymbol asm, EscapingTextWriter trapFi
             trapFile.Write("::");
         }
 
-        private static void BuildFunctionPointerTypeId(this IFunctionPointerTypeSymbol funptr, Context cx, EscapingTextWriter trapFile, ISymbol symbolBeingDefined)
-        {
+        private static void BuildFunctionPointerTypeId(this IFunctionPointerTypeSymbol funptr, Context cx, EscapingTextWriter trapFile, ISymbol symbolBeingDefined) =>
             BuildFunctionPointerSignature(funptr, trapFile, s => s.BuildOrWriteId(cx, trapFile, symbolBeingDefined));
-        }
 
         private static void BuildNamedTypeId(this INamedTypeSymbol named, Context cx, EscapingTextWriter trapFile, ISymbol symbolBeingDefined, bool constructUnderlyingTupleType)
         {
@@ -456,10 +454,8 @@ public static void BuildFunctionPointerSignature(IFunctionPointerTypeSymbol funp
             trapFile.Write('>');
         }
 
-        private static void BuildFunctionPointerTypeDisplayName(this IFunctionPointerTypeSymbol funptr, Context cx, TextWriter trapFile)
-        {
+        private static void BuildFunctionPointerTypeDisplayName(this IFunctionPointerTypeSymbol funptr, Context cx, TextWriter trapFile) =>
             BuildFunctionPointerSignature(funptr, trapFile, s => s.BuildDisplayName(cx, trapFile));
-        }
 
         private static void BuildNamedTypeDisplayName(this INamedTypeSymbol namedType, Context cx, TextWriter trapFile, bool constructUnderlyingTupleType)
         {

csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs

@@ -946,17 +946,13 @@ class TryStmt extends Stmt, @try_stmt {
     exists(ControlFlowElement mid |
       mid = this.getATriedElement() and
       not mid instanceof TryStmt and
-      result = getAChild(mid, mid.getEnclosingCallable())
+      result = mid.getAChild() and
+      pragma[only_bind_into](mid.getEnclosingCallable()) =
+        pragma[only_bind_into](result.getEnclosingCallable())
     )
   }
 }
 
-pragma[noinline]
-private ControlFlowElement getAChild(ControlFlowElement cfe, Callable c) {
-  result = cfe.getAChild() and
-  c = result.getEnclosingCallable()
-}
-
 /**
  * A `catch` clause within a `try` statement.
  *

csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs

@@ -36,6 +36,9 @@ class UsingDirective extends Element, @using_directive {
   }
 
   override Location getALocation() { using_directive_location(this, result) }
+
+  /** Holds if this directive is `global`. */
+  predicate isGlobal() { using_global(this) }
 }
 
 /**

csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs

@@ -324,6 +324,10 @@ parent_namespace_declaration(
 
 @using_directive = @using_namespace_directive | @using_static_directive;
 
+using_global(
+  unique int id: @using_directive ref
+);
+
 using_namespace_directives(
   unique int id: @using_namespace_directive,
   int namespace_id: @namespace ref);