Emit BeforeFieldInit flag on interfaces (#69850)

Fixes #69413.
dotnet · Sep 8, 2023 · cd3f12b · cd3f12b
1 parent 400fd5a
commit cd3f12b
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 2 deletions.
diff --git a/src/Compilers/CSharp/Portable/Emitter/Model/NamedTypeSymbolAdapter.cs b/src/Compilers/CSharp/Portable/Emitter/Model/NamedTypeSymbolAdapter.cs
@@ -507,8 +507,6 @@ bool Cci.ITypeDefinition.IsBeforeFieldInit
                 {
                     case TypeKind.Enum:
                     case TypeKind.Delegate:
-                    //C# interfaces don't have fields so the flag doesn't really matter, but Dev10 omits it
-                    case TypeKind.Interface:
                         return false;
                 }
 

diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
@@ -69148,5 +69148,76 @@ void validate(ModuleSymbol module)
                 }
             }
         }
+
+        [Fact]
+        [WorkItem("https://github.com/dotnet/roslyn/issues/69413")]
+        public void IsBeforeFieldInit_01()
+        {
+            var source1 =
+@"
+public interface I1
+{
+}
+
+public interface I2
+{
+    public static int F2;
+}
+
+public interface I3
+{
+    public static int F3 = 9;
+}
+
+public interface I4
+{
+    public static int F4;
+
+    static I4()
+    {
+        F4 = 10;
+    }
+}
+
+public interface I5
+{
+    static I5()
+    {
+        System.Console.WriteLine();
+    }
+}
+
+public interface I6
+{
+    public static int F6 = 18;
+
+    static I6()
+    {
+        System.Console.WriteLine();
+    }
+}
+";
+
+            var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll,
+                                                 targetFramework: TargetFramework.NetCoreApp,
+                                                 parseOptions: TestOptions.RegularPreview);
+
+            CompileAndVerify(compilation1, symbolValidator: validate, verify: VerifyOnMonoOrCoreClr).VerifyDiagnostics();
+
+            void validate(ModuleSymbol module)
+            {
+                Assert.True(hasBeforeFieldInitFlag(module, "I1"));
+                Assert.True(hasBeforeFieldInitFlag(module, "I2"));
+                Assert.True(hasBeforeFieldInitFlag(module, "I3"));
+                Assert.False(hasBeforeFieldInitFlag(module, "I4"));
+                Assert.False(hasBeforeFieldInitFlag(module, "I5"));
+                Assert.False(hasBeforeFieldInitFlag(module, "I6"));
+            }
+
+            static bool hasBeforeFieldInitFlag(ModuleSymbol module, string name)
+            {
+                return (((PENamedTypeSymbol)module.GlobalNamespace.GetTypeMember(name)).Flags & System.Reflection.TypeAttributes.BeforeFieldInit) != 0;
+            }
+        }
     }
 }