Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide real implementation for RuntimeSupportsStaticAbstractMembersInInterfaces property. #56173

Merged
merged 2 commits into from
Sep 7, 2021
Merged

Provide real implementation for RuntimeSupportsStaticAbstractMembersInInterfaces property. #56173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24443a3
Provide real implementation for RuntimeSupportsStaticAbstractMembersI…
AlekseyTs Sep 3, 2021
0852297
Fixup
AlekseyTs Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<BasicUndoVersion>0.9.3</BasicUndoVersion>
<BasicReferenceAssembliesNetStandard20Version>1.2.1</BasicReferenceAssembliesNetStandard20Version>
<BasicReferenceAssembliesNet50Version>1.2.1</BasicReferenceAssembliesNet50Version>
<BasicReferenceAssembliesNet60Version>1.2.2</BasicReferenceAssembliesNet60Version>
<BenchmarkDotNetVersion>0.13.0</BenchmarkDotNetVersion>
<BenchmarkDotNetDiagnosticsWindowsVersion>0.13.0</BenchmarkDotNetDiagnosticsWindowsVersion>
<DiffPlexVersion>1.4.4</DiffPlexVersion>
Expand Down
3 changes: 1 addition & 2 deletions src/Compilers/CSharp/Portable/Symbols/AssemblySymbol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,7 @@ internal bool RuntimeSupportsDefaultInterfaceImplementation
/// </summary>
internal bool RuntimeSupportsStaticAbstractMembersInInterfaces
{
// https://github.com/dotnet/roslyn/issues/53800: Implement the actual check, this is a temporary stub.
get => RuntimeSupportsDefaultInterfaceImplementation;
get => RuntimeSupportsFeature(SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__VirtualStaticsInInterfaces);
}

private bool RuntimeSupportsFeature(SpecialMember feature)
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10100,7 +10100,7 @@ public static void Main()
}
}
";
var comp = CreateCompilation(source, targetFramework: TargetFramework.NetCoreApp);
var comp = CreateCompilation(source, targetFramework: TargetFramework.Net60);
comp.VerifyEmitDiagnostics();
}

Expand Down
6 changes: 3 additions & 3 deletions src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7003,7 +7003,7 @@ class Test2 : I1
";
var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll,
parseOptions: TestOptions.Regular9,
targetFramework: TargetFramework.NetCoreApp);
targetFramework: TargetFramework.Net60);

compilation1.VerifyDiagnostics(
// (10,24): error CS8703: The modifier 'sealed' is not valid for this item in C# 9.0. Please use language version 'preview' or greater.
Expand Down Expand Up @@ -12210,7 +12210,7 @@ class Test2 : I1
";
var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll,
parseOptions: TestOptions.Regular9,
targetFramework: TargetFramework.NetCoreApp);
targetFramework: TargetFramework.Net60);

compilation1.VerifyDiagnostics(
// (4,25): error CS8703: The modifier 'abstract' is not valid for this item in C# 9.0. Please use language version 'preview' or greater.
Expand Down Expand Up @@ -25379,7 +25379,7 @@ class Test2 : I1
";
var compilation1 = CreateCompilation(source1, options: TestOptions.DebugDll,
parseOptions: TestOptions.Regular9,
targetFramework: TargetFramework.NetCoreApp);
targetFramework: TargetFramework.Net60);

compilation1.VerifyDiagnostics(
// (8,46): error CS0073: An add or remove accessor must have a body
Expand Down
1 change: 1 addition & 0 deletions src/Compilers/CSharp/Test/Symbol/Symbols/MissingSpecialMember.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@ public void AllSpecialTypeMembers()
var symbol = comp.GetSpecialTypeMember(special);
if (special == SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__DefaultImplementationsOfInterfaces
|| special == SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__CovariantReturnsOfClasses
|| special == SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__VirtualStaticsInInterfaces
|| special == SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__UnmanagedSignatureCallingConvention
|| special == SpecialMember.System_Runtime_CompilerServices_PreserveBaseOverridesAttribute__ctor)
{
Expand Down
947 changes: 484 additions & 463 deletions src/Compilers/CSharp/Test/Symbol/Symbols/StaticAbstractMembersInInterfacesTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/Compilers/Core/Portable/SpecialMember.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ internal enum SpecialMember
System_Runtime_CompilerServices_RuntimeFeature__DefaultImplementationsOfInterfaces,
System_Runtime_CompilerServices_RuntimeFeature__UnmanagedSignatureCallingConvention,
System_Runtime_CompilerServices_RuntimeFeature__CovariantReturnsOfClasses,
System_Runtime_CompilerServices_RuntimeFeature__VirtualStaticsInInterfaces,

System_Runtime_CompilerServices_PreserveBaseOverridesAttribute__ctor,

Expand Down
7 changes: 7 additions & 0 deletions src/Compilers/Core/Portable/SpecialMembers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,6 +1020,12 @@ static SpecialMembers()
0, // Arity
(byte)SignatureTypeCode.TypeHandle, (byte)SpecialType.System_String, // Field Signature

// System_Runtime_CompilerServices_RuntimeFeature__VirtualStaticsInInterfaces
(byte)(MemberFlags.Field | MemberFlags.Static), // Flags
(byte)SpecialType.System_Runtime_CompilerServices_RuntimeFeature, // DeclaringTypeId
0, // Arity
(byte)SignatureTypeCode.TypeHandle, (byte)SpecialType.System_String, // Field Signature

// System_Runtime_CompilerServices_PreserveBaseOverridesAttribute__ctor
(byte)MemberFlags.Constructor, // Flags
(byte)SpecialType.System_Runtime_CompilerServices_PreserveBaseOverridesAttribute, // DeclaringTypeId
Expand Down Expand Up @@ -1153,6 +1159,7 @@ static SpecialMembers()
"DefaultImplementationsOfInterfaces", // System_Runtime_CompilerServices_RuntimeFeature__DefaultImplementationsOfInterfaces
"UnmanagedSignatureCallingConvention", // System_Runtime_CompilerServices_RuntimeFeature__UnmanagedSignatureCallingConvention
"CovariantReturnsOfClasses", // System_Runtime_CompilerServices_RuntimeFeature__CovariantReturnsOfClasses
"VirtualStaticsInInterfaces", // System_Runtime_CompilerServices_RuntimeFeature__VirtualStaticsInInterfaces
".ctor", // System_Runtime_CompilerServices_PreserveBaseOverridesAttribute__ctor
};

Expand Down
1 change: 1 addition & 0 deletions src/Compilers/Test/Core/Microsoft.CodeAnalysis.Test.Utilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@

<PackageReference Include="Basic.Reference.Assemblies.NetStandard20" Version="$(BasicReferenceAssembliesNetStandard20Version)" />
<PackageReference Include="Basic.Reference.Assemblies.Net50" Version="$(BasicReferenceAssembliesNet50Version)" />
<PackageReference Include="Basic.Reference.Assemblies.Net60" Version="$(BasicReferenceAssembliesNet60Version)" />
</ItemGroup>

<Import Project="Generated.targets" />
Expand Down
6 changes: 5 additions & 1 deletion src/Compilers/Test/Core/TargetFrameworkUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ public enum TargetFramework
/// Minimal set of required types and Task implementation (<see cref="NetFx.Minimal.minasync"/>).
/// </summary>
MinimalAsync,

Net50,
Net60,
}

/// <summary>
Expand Down Expand Up @@ -177,7 +180,8 @@ public static class TargetFrameworkUtil
// Primary
TargetFramework.Empty => ImmutableArray<MetadataReference>.Empty,
TargetFramework.NetStandard20 => NetStandard20References,
TargetFramework.NetCoreApp => NetCoreApp.StandardReferences,
TargetFramework.NetCoreApp or TargetFramework.Net50 => NetCoreApp.StandardReferences,
TargetFramework.Net60 => ImmutableArray.CreateRange<MetadataReference>(Net60.All),
TargetFramework.NetCoreAppAndCSharp => NetCoreApp.StandardReferences.Add(NetCoreApp.MicrosoftCSharp),
TargetFramework.NetFramework => NetFramework.StandardReferences,

Expand Down
1 change: 1 addition & 0 deletions src/Compilers/VisualBasic/Test/Symbol/SymbolsTests/WellKnownTypeValidationTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ End Namespace
If special = SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__DefaultImplementationsOfInterfaces OrElse
special = SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__UnmanagedSignatureCallingConvention OrElse
special = SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__CovariantReturnsOfClasses OrElse
special = SpecialMember.System_Runtime_CompilerServices_RuntimeFeature__VirtualStaticsInInterfaces OrElse
special = SpecialMember.System_Runtime_CompilerServices_PreserveBaseOverridesAttribute__ctor Then
Assert.Null(symbol) ' Not available
Else
Expand Down
24 changes: 12 additions & 12 deletions src/EditorFeatures/CSharpTest/ImplementInterface/ImplementInterfaceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9429,7 +9429,7 @@ public int Foo
}

[WorkItem(53925, "https://github.com/dotnet/roslyn/issues/53925")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterfaceMember()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9467,7 +9467,7 @@ public static void M1()
}

[WorkItem(53925, "https://github.com/dotnet/roslyn/issues/53925")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterfaceMemberExplicitly()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9505,7 +9505,7 @@ static void ITest.M1()
}

[WorkItem(53925, "https://github.com/dotnet/roslyn/issues/53925")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterfaceMember_ImplementAbstractly()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9543,7 +9543,7 @@ public static void M1()
}

[WorkItem(53927, "https://github.com/dotnet/roslyn/issues/53927")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterfaceOperator_OnlyExplicitlyImplementable()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9579,7 +9579,7 @@ class C : ITest
}

[WorkItem(53927, "https://github.com/dotnet/roslyn/issues/53927")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterfaceOperator_ImplementImplicitly()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9622,7 +9622,7 @@ class C : ITest<C>
}

[WorkItem(53927, "https://github.com/dotnet/roslyn/issues/53927")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterfaceOperator_ImplementExplicitly()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9658,7 +9658,7 @@ class C : ITest<C>
}

[WorkItem(53927, "https://github.com/dotnet/roslyn/issues/53927")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterfaceOperator_ImplementAbstractly()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9695,7 +9695,7 @@ abstract class C : ITest<C>
}

[WorkItem(53927, "https://github.com/dotnet/roslyn/issues/53927")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterface_Explicitly()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9732,7 +9732,7 @@ static int ITest.M(ITest x)
}

[WorkItem(53927, "https://github.com/dotnet/roslyn/issues/53927")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterface_Implicitly()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9769,7 +9769,7 @@ public static int M(ITest x)
}

[WorkItem(53927, "https://github.com/dotnet/roslyn/issues/53927")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterface_ImplementImplicitly()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9806,7 +9806,7 @@ public static int M(C x)
}

[WorkItem(53927, "https://github.com/dotnet/roslyn/issues/53927")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterface_ImplementExplicitly()
{
await new VerifyCS.Test
Expand Down Expand Up @@ -9843,7 +9843,7 @@ static int ITest<C>.M(C x)
}

[WorkItem(53927, "https://github.com/dotnet/roslyn/issues/53927")]
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/56171"), Trait(Traits.Feature, Traits.Features.CodeActionsImplementInterface)]
public async Task TestStaticAbstractInterface_ImplementAbstractly()
{
await new VerifyCS.Test
Expand Down