Skip to content

Translate ref readonly in new synthetic call factory and unskip arglist tests #68951

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

Merged
jjonescz merged 2 commits into from
Jul 12, 2023
Merged

Translate ref readonly in new synthetic call factory and unskip arglist tests #68951

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
3ff3a5d
Unskip arglist tests
jjonescz Jul 10, 2023
836d07b
Translate `ref readonly` in synthetic call factory
jjonescz Jul 10, 2023
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
10 changes: 8 additions & 2 deletions src/Compilers/CSharp/Portable/Lowering/SyntheticBoundNodeFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,13 +821,19 @@ static ImmutableArray<RefKind> getArgumentRefKinds(MethodSymbol method, bool use
{
var result = method.ParameterRefKinds;

if (useStrictArgumentRefKinds && result.Contains(RefKind.In))
if (!result.IsDefaultOrEmpty && (result.Contains(RefKind.RefReadOnlyParameter) ||
(useStrictArgumentRefKinds && result.Contains(RefKind.In))))
{
var builder = ArrayBuilder<RefKind>.GetInstance(result.Length);

foreach (var refKind in result)
{
builder.Add(refKind == RefKind.In ? RefKindExtensions.StrictIn : refKind);
builder.Add(refKind switch
{
RefKind.In or RefKind.RefReadOnlyParameter when useStrictArgumentRefKinds => RefKindExtensions.StrictIn,
RefKind.RefReadOnlyParameter => RefKind.In,
_ => refKind
});
}

return builder.ToImmutableAndFree();
Expand Down
8 changes: 6 additions & 2 deletions src/Compilers/CSharp/Test/Emit2/Semantics/RefReadonlyParameterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2089,7 +2089,7 @@ void M(ref readonly int p)
Diagnostic(ErrorCode.ERR_AssgReadonly, "rorro").WithLocation(23, 9));
}

[Fact(Skip = "https://github.com/dotnet/roslyn/issues/68714")]
[ConditionalFact(typeof(WindowsOnly), Reason = ConditionalSkipReason.RestrictedTypesNeedDesktop)]
public void RefReadonlyParameter_Arglist()
{
var source = """
Expand All @@ -2105,7 +2105,11 @@ static void Main()
}
}
""";
var verifier = CompileAndVerify(source, expectedOutput: "111");
var verifier = CompileAndVerify(source, verify: Verification.FailsILVerify, expectedOutput: """
111
111
111
""");
verifier.VerifyDiagnostics(
// (7,11): warning CS9503: Argument 1 should be passed with 'ref' or 'in' keyword
// M(x, __arglist(x));
Expand Down
10 changes: 5 additions & 5 deletions src/Compilers/CSharp/Test/Semantic/Semantics/OverloadResolutionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9706,7 +9706,7 @@ static unsafe void Main()
verify: Verification.Fails).VerifyDiagnostics(expectedDiagnostics);
}

[Fact(Skip = "https://github.com/dotnet/roslyn/issues/68714")]
[ConditionalFact(typeof(WindowsOnly), Reason = ConditionalSkipReason.RestrictedTypesNeedDesktop)]
public void PassingArgumentsToInParameters_Arglist()
{
var source = """
Expand All @@ -9723,9 +9723,9 @@ static void Main()
}
""";
CreateCompilation(source, parseOptions: TestOptions.Regular11).VerifyDiagnostics(
// (8,15): error CS1615: Argument 1 may not be passed with the 'ref' keyword
// (8,15): error CS9505: Argument 1 may not be passed with the 'ref' keyword in language version 11.0. To pass 'ref' arguments to 'in' parameters, upgrade to language version preview or greater.
// M(ref x, __arglist(x));
Diagnostic(ErrorCode.ERR_BadArgExtraRef, "x").WithArguments("1", "ref").WithLocation(8, 15));
Diagnostic(ErrorCode.ERR_BadArgExtraRefLangVersion, "x").WithArguments("1", "11.0", "preview").WithLocation(8, 15));

var expectedDiagnostics = new[]
{
Expand All @@ -9734,8 +9734,8 @@ static void Main()
Diagnostic(ErrorCode.WRN_BadArgRef, "x").WithArguments("1").WithLocation(8, 15)
};

CompileAndVerify(source, expectedOutput: "555", parseOptions: TestOptions.RegularNext).VerifyDiagnostics(expectedDiagnostics);
CompileAndVerify(source, expectedOutput: "555").VerifyDiagnostics(expectedDiagnostics);
CompileAndVerify(source, expectedOutput: "555", verify: Verification.FailsILVerify, parseOptions: TestOptions.RegularNext).VerifyDiagnostics(expectedDiagnostics);
CompileAndVerify(source, expectedOutput: "555", verify: Verification.FailsILVerify).VerifyDiagnostics(expectedDiagnostics);
}

[Fact]
Expand Down