Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/Compilers/CSharp/Portable/CSharpResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -6857,4 +6857,7 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
<data name="WRN_InterpolatedStringHandlerArgumentAttributeIgnoredOnLambdaParameters_Title" xml:space="preserve">
<value>InterpolatedStringHandlerArgument has no effect when applied to lambda parameters and will be ignored at the call site.</value>
</data>
<data name="ERR_LambdaWithAttributesToExpressionTree" xml:space="preserve">
<value>A lambda expression with attributes cannot be converted to an expression tree</value>
</data>
</root>
1 change: 1 addition & 0 deletions src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1995,6 +1995,7 @@ internal enum ErrorCode
// WRN_AttrDependentTypeNotAllowed = 8969, // Backed out of of warning wave 6, may be reintroduced later
ERR_AttrDependentTypeNotAllowed = 8970,
WRN_InterpolatedStringHandlerArgumentAttributeIgnoredOnLambdaParameters = 8971,
ERR_LambdaWithAttributesToExpressionTree = 8972,

#endregion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,14 @@ public override BoundNode VisitLambda(BoundLambda node)
if (_inExpressionLambda)
{
var lambda = node.Symbol;
bool reportedAttributes = false;

if (!lambda.GetAttributes().IsEmpty || !lambda.GetReturnTypeAttributes().IsEmpty)
{
Error(ErrorCode.ERR_LambdaWithAttributesToExpressionTree, node);
reportedAttributes = true;
}

foreach (var p in lambda.Parameters)
{
if (p.RefKind != RefKind.None && p.Locations.Length != 0)
Expand All @@ -527,6 +535,12 @@ public override BoundNode VisitLambda(BoundLambda node)
{
_diagnostics.Add(ErrorCode.ERR_ExpressionTreeCantContainRefStruct, p.Locations[0], p.Type.Name);
}

if (!reportedAttributes && !p.GetAttributes().IsEmpty)
{
_diagnostics.Add(ErrorCode.ERR_LambdaWithAttributesToExpressionTree, p.Locations[0]);
reportedAttributes = true;
}
}

switch (node.Syntax.Kind())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public override ImmutableArray<Symbol> GetMembers()
ImmutableArray<Symbol> makeMembers(ImmutableArray<Symbol> underlyingMembers)
{
var builder = ArrayBuilder<Symbol>.GetInstance();
builder.Add(new SynthesizedInstanceConstructor(this));
foreach (var underlyingMember in underlyingMembers)
{
Debug.Assert(_underlyingType.Equals(underlyingMember.ContainingSymbol));
Expand Down Expand Up @@ -103,6 +102,13 @@ ImmutableArray<Symbol> makeMembers(ImmutableArray<Symbol> underlyingMembers)
break;
}
break;

case MethodKind.Constructor:
if (underlyingMethod.ParameterCount == 0)
{
builder.Add(new NativeIntegerMethodSymbol(this, underlyingMethod, associatedSymbol: null));
}
break;
}
break;
case PropertySymbol underlyingProperty:
Expand Down
5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading