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

Disallow ref structs in expression trees #30871

Merged
merged 16 commits into from
Nov 5, 2018
Merged

Disallow ref structs in expression trees #30871

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dae7d0b
Expression tree reflike checks WIP
RikkiGibson Oct 30, 2018
7e3c11d
Move test from emit to semantics
RikkiGibson Oct 31, 2018
04a4c21
Fix ExpressionTreeRefLikeWalker
RikkiGibson Oct 31, 2018
a8558b9
Fix label indent
RikkiGibson Oct 31, 2018
58c6e41
Add more tests
RikkiGibson Oct 31, 2018
e04bc57
Move ExpressionTreeRefLikeWalker logic to DiagnosticsPass
RikkiGibson Oct 31, 2018
8a3487a
Resolve TODOs in IsExpressionTree
RikkiGibson Nov 1, 2018
a080a34
Ignore BoundConversion when checking for ref structs in expression trees
RikkiGibson Nov 1, 2018
f284763
Comment on the purpose of `!(node is BoundConversion)`
RikkiGibson Nov 2, 2018
554d8a4
Add ErrorCode.ERR_ExpressionTreeCantContainRefStruct
RikkiGibson Nov 2, 2018
f9db286
Use new error code in DiagnosticsPass
RikkiGibson Nov 2, 2018
cbab024
Update tests
RikkiGibson Nov 2, 2018
0dd8fd0
Add TypedReference tests
RikkiGibson Nov 2, 2018
14812f2
Replace IsByRefLikeType check with IsRestrictedType() check
RikkiGibson Nov 2, 2018
94e13ec
Simplify VisitLambda
RikkiGibson Nov 2, 2018
47f0d07
Add new diagnostics to ArglistTests.ExpressionTreeTest
RikkiGibson Nov 2, 2018
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
39 changes: 27 additions & 12 deletions src/Compilers/CSharp/Portable/Lowering/DiagnosticsPass_ExpressionTrees.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,18 @@ private void VisitCall(
}
}

public override BoundNode Visit(BoundNode node)
{
if (_inExpressionLambda &&
node is BoundExpression expr &&
expr.Type is TypeSymbol type &&
type.IsByRefLikeType)
{
Error(ErrorCode.ERR_FeatureNotValidInExpressionTree, node, "ref struct");
}
return base.Visit(node);
}

public override BoundNode VisitRefTypeOperator(BoundRefTypeOperator node)
{
if (_inExpressionLambda)
Expand Down Expand Up @@ -342,6 +354,21 @@ public override BoundNode VisitLambda(BoundLambda node)
{
if (_inExpressionLambda)
{
var lambda = node.ExpressionSymbol as MethodSymbol;
if ((object)lambda != null)
{
foreach (var p in lambda.Parameters)
{
if (p.RefKind != RefKind.None && p.Locations.Length != 0)
{
_diagnostics.Add(ErrorCode.ERR_ByRefParameterInExpressionTree, p.Locations[0]);
}
if (p.Type.TypeSymbol?.IsByRefLikeType == true)
{
_diagnostics.Add(ErrorCode.ERR_FeatureNotValidInExpressionTree, p.Locations[0], "ref struct");
}
}
}
switch (node.Syntax.Kind())
{
case SyntaxKind.ParenthesizedLambdaExpression:
Expand All @@ -359,18 +386,6 @@ public override BoundNode VisitLambda(BoundLambda node)
{
Error(ErrorCode.ERR_BadRefReturnExpressionTree, node);
}

var lambda = node.ExpressionSymbol as MethodSymbol;
if ((object)lambda != null)
{
foreach (var p in lambda.Parameters)
{
if (p.RefKind != RefKind.None && p.Locations.Length != 0)
{
_diagnostics.Add(ErrorCode.ERR_ByRefParameterInExpressionTree, p.Locations[0]);
}
}
}
}
break;

Expand Down
1 change: 1 addition & 0 deletions src/Compilers/CSharp/Portable/Symbols/TypeSymbolExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ public static NamedTypeSymbol GetDelegateType(this TypeSymbol type)
/// </summary>
public static bool IsExpressionTree(this TypeSymbol _type)
{
// TODO: add Compilation/Binder parameter to get WellKnownType and compare
// TODO: there must be a better way!
var type = _type.OriginalDefinition as NamedTypeSymbol;
return
Expand Down
101 changes: 101 additions & 0 deletions src/Compilers/CSharp/Test/Semantic/Semantics/LambdaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,6 +1533,107 @@ static void Main()
Diagnostic(ErrorCode.ERR_ExpressionTreeContainsAssignment, "y = y").WithLocation(9, 45));
}

[Fact, WorkItem(30776, "https://github.com/dotnet/roslyn/issues/30776")]
public void RefStructExpressionTree()
{
var text = @"
using System;
using System.Linq.Expressions;
public class Class1
{
public void Method1()
{
Method((Class1 c) => c.Method2(default(Struct1)));
}

public void Method2(Struct1 s1) { }

public static void Method<T>(Expression<Action<T>> expression) { }
}

public ref struct Struct1 { }
";
var compilation = CreateCompilationWithMscorlib40AndSystemCore(text).VerifyDiagnostics(
// (8,40): error CS7053: An expression tree may not contain 'ref struct'
// Method((Class1 c) => c.Method2(default(Struct1)));
Diagnostic(ErrorCode.ERR_FeatureNotValidInExpressionTree, "default(Struct1)").WithArguments("ref struct").WithLocation(8, 40));
}

[Fact, WorkItem(30776, "https://github.com/dotnet/roslyn/issues/30776")]
public void RefStructNewExpressionTree()
{
var text = @"
using System;
using System.Linq.Expressions;
public class Class1
{
public void Method1()
{
Method((Class1 c) => c.Method2(new Struct1()));
}

public void Method2(Struct1 s1) { }

public static void Method<T>(Expression<Action<T>> expression) { }
}

public ref struct Struct1 { }
";
var compilation = CreateCompilationWithMscorlib40AndSystemCore(text).VerifyDiagnostics(
// (8,40): error CS7053: An expression tree may not contain 'ref struct'
// Method((Class1 c) => c.Method2(new Struct1()));
Diagnostic(ErrorCode.ERR_FeatureNotValidInExpressionTree, "new Struct1()").WithArguments("ref struct").WithLocation(8, 40));
}

[Fact, WorkItem(30776, "https://github.com/dotnet/roslyn/issues/30776")]
public void RefStructParamExpressionTree()
{
var text = @"
using System.Linq.Expressions;

public delegate void Delegate1(Struct1 s);
public class Class1
{
public void Method1()
{
Method((Struct1 s) => Method2());
}

public void Method2() { }

public static void Method(Expression<Delegate1> expression) { }
}

public ref struct Struct1 { }
";
var compilation = CreateCompilationWithMscorlib40AndSystemCore(text).VerifyDiagnostics(
// (9,25): error CS7053: An expression tree may not contain 'ref struct'
// Method((Struct1 s) => Method2());
Diagnostic(ErrorCode.ERR_FeatureNotValidInExpressionTree, "s").WithArguments("ref struct").WithLocation(9, 25));
}

[Fact, WorkItem(30776, "https://github.com/dotnet/roslyn/issues/30776")]
public void RefStructParamLambda()
{
var text = @"
public delegate void Delegate1(Struct1 s);
public class Class1
{
public void Method1()
{
Method((Struct1 s) => Method2());
}

public void Method2() { }

public static void Method(Delegate1 expression) { }
}

public ref struct Struct1 { }
";
var compilation = CreateCompilationWithMscorlib40AndSystemCore(text).VerifyDiagnostics();
}

[Fact, WorkItem(5363, "https://github.com/dotnet/roslyn/issues/5363")]
public void ReturnInferenceCache_Dynamic_vs_Object_01()
{
Expand Down