Handle global methods in GetEmbeddedTypeForMember

RikkiGibson · RikkiGibson · commit 202850810763 · 2022-01-13T14:04:08.000-08:00
diff --git a/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs b/src/Compilers/CSharp/Portable/Emitter/NoPia/EmbeddedTypesManager.cs
@@ -589,6 +589,12 @@ protected override EmbeddedType GetEmbeddedTypeForMember(SymbolAdapter member, S
             Debug.Assert(member.AdaptedSymbol.IsDefinition);
             Debug.Assert(ModuleBeingBuilt.SourceModule.AnyReferencedAssembliesAreLinked);
 
+            if (member.AdaptedSymbol.OriginalDefinition is SynthesizedGlobalMethodSymbol)
+            {
+                // No need to embed an internal type from current assembly
+                return null;
+            }
+
             NamedTypeSymbol namedType = member.AdaptedSymbol.ContainingType;
 
             if (IsValidEmbeddableType(namedType, syntaxNodeOpt, diagnostics, this))
diff --git a/src/Compilers/CSharp/Test/Emit2/CodeGen/CodeGenNullCheckedParameterTests.cs b/src/Compilers/CSharp/Test/Emit2/CodeGen/CodeGenNullCheckedParameterTests.cs
@@ -2029,5 +2029,44 @@ .maxstack  2
   IL_0024:  ret
 }");
         }
+
+        [Fact, WorkItem(58824, "https://github.com/dotnet/roslyn/issues/58824")]
+        public void TestWithEmbeddedReference()
+        {
+            var source = @"
+using System;
+
+C.M(""a"");
+Console.Write(1);
+try
+{
+    C.M(null);
+    Console.Write(0);
+}
+catch
+{
+    Console.Write(2);
+}
+
+class C
+{
+    public static void M(string s!!)
+    {
+    }
+}
+";
+            var verifier = CompileAndVerify(source, references: new[] { TestReferences.SymbolsTests.NoPia.GeneralPia.WithEmbedInteropTypes(true) }, expectedOutput: "12");
+            verifier.VerifyDiagnostics();
+            verifier.VerifyIL("C.M", @"
+{
+    // Code size       12 (0xc)
+    .maxstack  2
+    IL_0000:  ldarg.0
+    IL_0001:  ldstr      ""s""
+    IL_0006:  call       ""ThrowIfNull""
+    IL_000b:  ret
+}
+");
+        }
     }
 }
