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

Attempt to mark EqualityContract property accessor as not auto-implemented #57917

Merged
merged 7 commits into from
Nov 30, 2021
Merged

Attempt to mark EqualityContract property accessor as not auto-implemented #57917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
28da847
Attempt to mark EqualityContract property accessor as not auto-implem…
Youssef1313 Nov 22, 2021
24c7a93
Update SynthesizedRecordEqualityContractProperty.cs
Youssef1313 Nov 22, 2021
f041581
Add CompilerGeneratedAttribute to get_EqualityContract
Youssef1313 Nov 30, 2021
17263c7
Fix test
Youssef1313 Nov 30, 2021
8195a6e
Validate using GetAttributes as well
Youssef1313 Nov 30, 2021
5b22a04
Add assertion
Youssef1313 Nov 30, 2021
55f9798
Remove VerifyTypeIL
Youssef1313 Nov 30, 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
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Portable/Symbols/Source/SourcePropertyAccessorSymbol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ internal sealed override void AddSynthesizedReturnTypeAttributes(PEModuleBuilder
}
}

internal sealed override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
{
base.AddSynthesizedAttributes(moduleBuilder, ref attributes);

Expand Down
15 changes: 13 additions & 2 deletions .../CSharp/Portable/Symbols/Synthesized/Records/SynthesizedRecordEqualityContractProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

using System.Collections.Immutable;
using System.Diagnostics;
using Microsoft.CodeAnalysis.CSharp.Emit;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.PooledObjects;
using Roslyn.Utilities;

namespace Microsoft.CodeAnalysis.CSharp.Symbols
Expand Down Expand Up @@ -128,18 +130,27 @@ internal GetAccessorSymbol(
propertyModifiers,
location,
syntax,
hasBody: false,
hasBody: true,
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
hasExpressionBody: false,
isIterator: false,
modifiers: new SyntaxTokenList(),
MethodKind.PropertyGet,
usesInit: false,
isAutoPropertyAccessor: true,
isAutoPropertyAccessor: false,
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
isNullableAnalysisEnabled: false,
diagnostics)
{
}

internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
{
base.AddSynthesizedAttributes(moduleBuilder, ref attributes);

var compilation = this.DeclaringCompilation;
AddSynthesizedAttribute(ref attributes, compilation.TrySynthesizeAttribute(WellKnownMember.System_Runtime_CompilerServices_CompilerGeneratedAttribute__ctor));
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
Debug.Assert(WellKnownMembers.IsSynthesizedAttributeOptional(WellKnownMember.System_Runtime_CompilerServices_CompilerGeneratedAttribute__ctor));
}

public override ImmutableArray<SyntaxReference> DeclaringSyntaxReferences => ImmutableArray<SyntaxReference>.Empty;

internal override bool SynthesizesLoweredBoundBody => true;
Expand Down
17 changes: 17 additions & 0 deletions src/Compilers/CSharp/Test/Symbol/Symbols/Source/RecordTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1804,5 +1804,22 @@ static void Main()
CompileAndVerify(src1 + src2 + src3, expectedOutput: "C { Y = 22, X = 11, U = 44, Z = 33 }").VerifyDiagnostics();
CompileAndVerify(new[] { src1, src2, src3 }, expectedOutput: "C { Y = 22, X = 11, U = 44, Z = 33 }").VerifyDiagnostics();
}

[Fact]
public void EqualityContractGetter_CompilerGeneratedAttribute()
{
var verifier = CompileAndVerify(@"
using System;

record C;
", symbolValidator: validate);

static void validate(ModuleSymbol module)
{
var member = module.GlobalNamespace.GetTypeMember("C").GetMember("get_EqualityContract");
var attributes = member.GetAttributes();
Assert.Equal(new[] { "CompilerGeneratedAttribute" }, GetAttributeNames(attributes));
}
}
}
}