Skip to content

Do not convert tuple expression with error to a bad expression too early #78645

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
merged 3 commits into from
May 28, 2025
Merged

Do not convert tuple expression with error to a bad expression too early #78645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7189f6
Do not convert tuple expression with error to a bad expression too early
DoctorKrolic May 19, 2025
2829154
Rearrange usings back
DoctorKrolic May 23, 2025
6ff1912
Take a different approach
DoctorKrolic May 24, 2025
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
7 changes: 1 addition & 6 deletions src/Compilers/CSharp/Portable/Binder/Binder.ValueChecks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,13 +579,8 @@ private BoundExpression CheckValue(BoundExpression expr, BindValueKind valueKind
break;

case BoundKind.UnconvertedObjectCreationExpression:
if (valueKind == BindValueKind.RValue)
{
return expr;
}
break;

case BoundKind.UnconvertedCollectionExpression:
case BoundKind.TupleLiteral:
if (valueKind == BindValueKind.RValue)
{
return expr;
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ private BoundBadExpression BadExpression(SyntaxNode syntax, LookupResultKind res

/// <summary>
/// Helper method to generate a bound expression with HasErrors set to true.
/// Returned bound expression is guaranteed to have a non-null type, except when <paramref name="expr"/> is an unbound lambda.
/// Returned bound expression is guaranteed to have a non-null type, except when <paramref name="expr"/> is an unbound lambda or a default literal
/// If <paramref name="expr"/> already has errors and meets the above type requirements, then it is returned unchanged.
/// Otherwise, if <paramref name="expr"/> is a BoundBadExpression, then it is updated with the <paramref name="resultKind"/> and non-null type.
/// Otherwise, a new <see cref="BoundBadExpression"/> wrapping <paramref name="expr"/> is returned.
Expand Down
206 changes: 206 additions & 0 deletions src/Compilers/CSharp/Test/Semantic/Semantics/ValueTupleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@

#nullable disable

using System.Linq;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.CSharp.UnitTests;
using Microsoft.CodeAnalysis.Emit;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
using Xunit;

Expand Down Expand Up @@ -637,5 +640,208 @@ public interface ITuple<T1, T2, T3, T4, T5, T6, T7, TRest>
var comp = CreateEmptyCompilation(new[] { source, Stubs });
comp.VerifyEmitDiagnostics(EmitOptions.Default.WithRuntimeMetadataVersion("0.0.0.0"));
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78627")]
public void TargetTypedTupleErrorRecovery_Return()
{
var source = """
class C
{
public C(int i, string s) { }

(object, C) M()
{
return (default, new(1,));
}
}
""";

var comp = CreateCompilation(source);
comp.VerifyDiagnostics(
// (7,32): error CS1525: Invalid expression term ')'
// return (default, new(1,));
Diagnostic(ErrorCode.ERR_InvalidExprTerm, ")").WithArguments(")").WithLocation(7, 32));

var tree = comp.SyntaxTrees.First();
var model = comp.GetSemanticModel(tree);

var tupleExpression = tree.GetCompilationUnitRoot().DescendantNodes().OfType<TupleExpressionSyntax>().Single();
var tupleTypeInfo = model.GetTypeInfo(tupleExpression);
Assert.Null(tupleTypeInfo.Type);
Assert.Equal("(System.Object, C)", tupleTypeInfo.ConvertedType.ToTestDisplayString());

var firstTupleArgExpr = tupleExpression.Arguments[0].Expression;
var firstTupleArgInfo = model.GetTypeInfo(firstTupleArgExpr);
Assert.Equal("System.Object", firstTupleArgInfo.Type.ToTestDisplayString());
Assert.Equal("System.Object", firstTupleArgInfo.ConvertedType.ToTestDisplayString());

var secondTupleArgExpr = tupleExpression.Arguments[1].Expression;
var secondTupleArgInfo = model.GetTypeInfo(secondTupleArgExpr);
Assert.Equal("C", secondTupleArgInfo.Type.ToTestDisplayString());
Assert.Equal("C", secondTupleArgInfo.ConvertedType.ToTestDisplayString());
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78627")]
public void TargetTypedTupleErrorRecovery_VariableDeclaration()
{
var source = """
class C
{
public C(int i, string s) { }

void M()
{
(C, long) t = (new(3,), 89);
}
}
""";

var comp = CreateCompilation(source);
comp.VerifyDiagnostics(
// (7,30): error CS1525: Invalid expression term ')'
// (C, long) t = (new(3,), 89);
Diagnostic(ErrorCode.ERR_InvalidExprTerm, ")").WithArguments(")").WithLocation(7, 30));

var tree = comp.SyntaxTrees.First();
var model = comp.GetSemanticModel(tree);

var tupleExpression = tree.GetCompilationUnitRoot().DescendantNodes().OfType<TupleExpressionSyntax>().Single();
var tupleTypeInfo = model.GetTypeInfo(tupleExpression);
Assert.Null(tupleTypeInfo.Type);
Assert.Equal("(C, System.Int64)", tupleTypeInfo.ConvertedType.ToTestDisplayString());

var firstTupleArgExpr = tupleExpression.Arguments[0].Expression;
var firstTupleArgInfo = model.GetTypeInfo(firstTupleArgExpr);
Assert.Equal("C", firstTupleArgInfo.Type.ToTestDisplayString());
Assert.Equal("C", firstTupleArgInfo.ConvertedType.ToTestDisplayString());

var secondTupleArgExpr = tupleExpression.Arguments[1].Expression;
var secondTupleArgInfo = model.GetTypeInfo(secondTupleArgExpr);
Assert.Equal("System.Int32", secondTupleArgInfo.Type.ToTestDisplayString());
Assert.Equal("System.Int64", secondTupleArgInfo.ConvertedType.ToTestDisplayString());
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78627")]
public void TargetTypedTupleErrorRecovery_Assignment()
{
var source = """
class C
{
public C(int i, string s) { }

void M()
{
(C, object) t;
t = (new(3,), "");
}
}
""";

var comp = CreateCompilation(source);
comp.VerifyDiagnostics(
// (8,20): error CS1525: Invalid expression term ')'
// t = (new(3,), "");
Diagnostic(ErrorCode.ERR_InvalidExprTerm, ")").WithArguments(")").WithLocation(8, 20));

var tree = comp.SyntaxTrees.First();
var model = comp.GetSemanticModel(tree);

var tupleExpression = tree.GetCompilationUnitRoot().DescendantNodes().OfType<TupleExpressionSyntax>().Single();
var tupleTypeInfo = model.GetTypeInfo(tupleExpression);
Assert.Null(tupleTypeInfo.Type);
Assert.Equal("(C, System.Object)", tupleTypeInfo.ConvertedType.ToTestDisplayString());

var firstTupleArgExpr = tupleExpression.Arguments[0].Expression;
var firstTupleArgInfo = model.GetTypeInfo(firstTupleArgExpr);
Assert.Equal("C", firstTupleArgInfo.Type.ToTestDisplayString());
Assert.Equal("C", firstTupleArgInfo.ConvertedType.ToTestDisplayString());

var secondTupleArgExpr = tupleExpression.Arguments[1].Expression;
var secondTupleArgInfo = model.GetTypeInfo(secondTupleArgExpr);
Assert.Equal("System.String", secondTupleArgInfo.Type.ToTestDisplayString());
Assert.Equal("System.Object", secondTupleArgInfo.ConvertedType.ToTestDisplayString());
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78627")]
public void TargetTypedTupleErrorRecovery_Call()
{
var source = """
class C
{
public C(int i, string s) { }

void M()
{
N((8, new(9,)));
}

void N((int?, C) arg) { }
}
""";

var comp = CreateCompilation(source);
comp.VerifyDiagnostics(
// (7,21): error CS1525: Invalid expression term ')'
// N((8, new(9,)));
Diagnostic(ErrorCode.ERR_InvalidExprTerm, ")").WithArguments(")").WithLocation(7, 21));

var tree = comp.SyntaxTrees.First();
var model = comp.GetSemanticModel(tree);

var tupleExpression = tree.GetCompilationUnitRoot().DescendantNodes().OfType<TupleExpressionSyntax>().Single();
var tupleTypeInfo = model.GetTypeInfo(tupleExpression);
Assert.Null(tupleTypeInfo.Type);
Assert.Equal("(System.Int32?, C)", tupleTypeInfo.ConvertedType.ToTestDisplayString());

var firstTupleArgExpr = tupleExpression.Arguments[0].Expression;
var firstTupleArgInfo = model.GetTypeInfo(firstTupleArgExpr);
Assert.Equal("System.Int32", firstTupleArgInfo.Type.ToTestDisplayString());
Assert.Equal("System.Int32?", firstTupleArgInfo.ConvertedType.ToTestDisplayString());

var secondTupleArgExpr = tupleExpression.Arguments[1].Expression;
var secondTupleArgInfo = model.GetTypeInfo(secondTupleArgExpr);
Assert.Equal("C", secondTupleArgInfo.Type.ToTestDisplayString());
Assert.Equal("C", secondTupleArgInfo.ConvertedType.ToTestDisplayString());
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/78627")]
public void TargetTypedTupleErrorRecovery_Cast()
{
var source = """
class C
{
public C(int i, string s) { }

void M()
{
var t = ((object, C))(null, new(47,));
}
}
""";

var comp = CreateCompilation(source);
comp.VerifyDiagnostics(
// (7,44): error CS1525: Invalid expression term ')'
// var t = ((object, C))(null, new(47,));
Diagnostic(ErrorCode.ERR_InvalidExprTerm, ")").WithArguments(")").WithLocation(7, 44));

var tree = comp.SyntaxTrees.First();
var model = comp.GetSemanticModel(tree);

var tupleExpression = tree.GetCompilationUnitRoot().DescendantNodes().OfType<TupleExpressionSyntax>().Single();
var tupleTypeInfo = model.GetTypeInfo(tupleExpression);
Assert.Null(tupleTypeInfo.Type);
Assert.Equal("(System.Object, C)", tupleTypeInfo.ConvertedType.ToTestDisplayString());

var firstTupleArgExpr = tupleExpression.Arguments[0].Expression;
var firstTupleArgInfo = model.GetTypeInfo(firstTupleArgExpr);
Assert.Null(firstTupleArgInfo.Type);
Assert.Equal("System.Object", firstTupleArgInfo.ConvertedType.ToTestDisplayString());

var secondTupleArgExpr = tupleExpression.Arguments[1].Expression;
var secondTupleArgInfo = model.GetTypeInfo(secondTupleArgExpr);
Assert.Equal("C", secondTupleArgInfo.Type.ToTestDisplayString());
Assert.Equal("C", secondTupleArgInfo.ConvertedType.ToTestDisplayString());
}
}
}