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
86 changes: 62 additions & 24 deletions src/Compilers/CSharp/Portable/Binder/Binder.ValueChecks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4389,16 +4389,33 @@ internal SafeContext GetValEscape(BoundExpression expr, SafeContext localScopeDe

if (compound.Operator.Method is { } compoundMethod)
{
return GetInvocationEscapeScope(
MethodInfo.Create(compoundMethod),
receiver: null,
receiverIsSubjectToCloning: ThreeState.Unknown,
compoundMethod.Parameters,
argsOpt: [compound.Left, compound.Right],
argRefKindsOpt: default,
argsToParamsOpt: default,
localScopeDepth: localScopeDepth,
isRefEscape: false);
if (compoundMethod.IsStatic)
{
return GetInvocationEscapeScope(
MethodInfo.Create(compoundMethod),
receiver: null,
receiverIsSubjectToCloning: ThreeState.Unknown,
compoundMethod.Parameters,
argsOpt: [compound.Left, compound.Right],
argRefKindsOpt: default,
argsToParamsOpt: default,
localScopeDepth: localScopeDepth,
isRefEscape: false);
}
else
{
// PROTOTYPE: Follow-up and test this code path
return GetInvocationEscapeScope(
MethodInfo.Create(compoundMethod),
receiver: compound.Left,
receiverIsSubjectToCloning: ThreeState.False,
compoundMethod.Parameters,
argsOpt: [compound.Right],
argRefKindsOpt: default,
argsToParamsOpt: default,
localScopeDepth: localScopeDepth,
isRefEscape: false);
}
}

return GetValEscape(compound.Left, localScopeDepth)
Expand Down Expand Up @@ -5176,20 +5193,41 @@ internal bool CheckValEscape(SyntaxNode node, BoundExpression expr, SafeContext

if (compound.Operator.Method is { } compoundMethod)
{
return CheckInvocationEscape(
compound.Syntax,
MethodInfo.Create(compoundMethod),
receiver: null,
receiverIsSubjectToCloning: ThreeState.Unknown,
compoundMethod.Parameters,
argsOpt: [compound.Left, compound.Right],
argRefKindsOpt: default,
argsToParamsOpt: default,
checkingReceiver: checkingReceiver,
escapeFrom: escapeFrom,
escapeTo: escapeTo,
diagnostics,
isRefEscape: false);
if (compoundMethod.IsStatic)
{
return CheckInvocationEscape(
compound.Syntax,
MethodInfo.Create(compoundMethod),
receiver: null,
receiverIsSubjectToCloning: ThreeState.Unknown,
compoundMethod.Parameters,
argsOpt: [compound.Left, compound.Right],
argRefKindsOpt: default,
argsToParamsOpt: default,
checkingReceiver: checkingReceiver,
escapeFrom: escapeFrom,
escapeTo: escapeTo,
diagnostics,
isRefEscape: false);
}
else
{
// PROTOTYPE: Follow-up and test this code path
return CheckInvocationEscape(
compound.Syntax,
MethodInfo.Create(compoundMethod),
receiver: compound.Left,
receiverIsSubjectToCloning: ThreeState.Unknown,
compoundMethod.Parameters,
argsOpt: [compound.Right],
argRefKindsOpt: default,
argsToParamsOpt: default,
checkingReceiver: checkingReceiver,
escapeFrom: escapeFrom,
escapeTo: escapeTo,
diagnostics,
isRefEscape: false);
}
}

return CheckValEscape(compound.Left.Syntax, compound.Left, escapeFrom, escapeTo, checkingReceiver: false, diagnostics: diagnostics) &&
Expand Down
Loading