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.

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

Support accessing members of a conditional value #35390

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fold member access into conditional
Fixes #34589.
ranma42 committed Jan 6, 2025
commit 88a56bb52f70582f0079c35bb348ca17f423a95b
Original file line number Diff line number Diff line change
@@ -1146,6 +1146,16 @@ public Expression Expand(InMemoryQueryExpression queryExpression, Expression lam

protected override Expression VisitMember(MemberExpression memberExpression)
{
// Fold member access into conditional, i.e. transform
// (test ? expr1 : expr2).Member -> (test ? expr1.Member : expr2.Member)
if (memberExpression.Expression is ConditionalExpression cond) {
return Visit(Expression.Condition(
cond.Test,
Expression.MakeMemberAccess(cond.IfTrue, memberExpression.Member),
Expression.MakeMemberAccess(cond.IfFalse, memberExpression.Member)
));
}

var innerExpression = Visit(memberExpression.Expression);

return TryExpand(innerExpression, MemberIdentity.Create(memberExpression.Member))
Original file line number Diff line number Diff line change
@@ -631,6 +631,16 @@ protected override Expression VisitListInit(ListInitExpression listInitExpressio
/// <inheritdoc />
protected override Expression VisitMember(MemberExpression memberExpression)
{
// Fold member access into conditional, i.e. transform
// (test ? expr1 : expr2).Member -> (test ? expr1.Member : expr2.Member)
if (memberExpression.Expression is ConditionalExpression cond) {
return Visit(Expression.Condition(
cond.Test,
Expression.MakeMemberAccess(cond.IfTrue, memberExpression.Member),
Expression.MakeMemberAccess(cond.IfFalse, memberExpression.Member)
));
}

var innerExpression = Visit(memberExpression.Expression);

return TryBindMember(innerExpression, MemberIdentity.Create(memberExpression.Member), out var expression)