[mutation analyzer][NFC] combine ConditionalOperator BinaryConditionalOperator
#118602
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang Author: Congcong Cai (HerrCai0907) ChangesFull diff: https://github.com/llvm/llvm-project/pull/118602.diff 1 Files Affected:
diff --git a/clang/lib/Analysis/ExprMutationAnalyzer.cpp b/clang/lib/Analysis/ExprMutationAnalyzer.cpp
index be0e8aa5743dd9..9387d67b6828f1 100644
--- a/clang/lib/Analysis/ExprMutationAnalyzer.cpp
+++ b/clang/lib/Analysis/ExprMutationAnalyzer.cpp
@@ -55,23 +55,11 @@ static bool canExprResolveTo(const Expr *Source, const Expr *Target) {
// This is matched by `IgnoreDerivedToBase(canResolveToExpr(InnerMatcher))`
// below.
const auto ConditionalOperatorM = [Target](const Expr *E) {
- if (const auto *OP = dyn_cast<ConditionalOperator>(E)) {
- if (const auto *TE = OP->getTrueExpr()->IgnoreParens())
+ if (const auto *CO = dyn_cast<AbstractConditionalOperator>(E)) {
+ if (const auto *TE = CO->getTrueExpr()->IgnoreParens())
if (canExprResolveTo(TE, Target))
return true;
- if (const auto *FE = OP->getFalseExpr()->IgnoreParens())
- if (canExprResolveTo(FE, Target))
- return true;
- }
- return false;
- };
-
- const auto ElvisOperator = [Target](const Expr *E) {
- if (const auto *OP = dyn_cast<BinaryConditionalOperator>(E)) {
- if (const auto *TE = OP->getTrueExpr()->IgnoreParens())
- if (canExprResolveTo(TE, Target))
- return true;
- if (const auto *FE = OP->getFalseExpr()->IgnoreParens())
+ if (const auto *FE = CO->getFalseExpr()->IgnoreParens())
if (canExprResolveTo(FE, Target))
return true;
}
@@ -81,8 +69,7 @@ static bool canExprResolveTo(const Expr *Source, const Expr *Target) {
const Expr *SourceExprP = Source->IgnoreParens();
return IgnoreDerivedToBase(SourceExprP,
[&](const Expr *E) {
- return E == Target || ConditionalOperatorM(E) ||
- ElvisOperator(E);
+ return E == Target || ConditionalOperatorM(E);
}) ||
EvalCommaExpr(SourceExprP, [&](const Expr *E) {
return IgnoreDerivedToBase(
|
Member
|
@llvm/pr-subscribers-clang-analysis Author: Congcong Cai (HerrCai0907) ChangesFull diff: https://github.com/llvm/llvm-project/pull/118602.diff 1 Files Affected:
diff --git a/clang/lib/Analysis/ExprMutationAnalyzer.cpp b/clang/lib/Analysis/ExprMutationAnalyzer.cpp
index be0e8aa5743dd9..9387d67b6828f1 100644
--- a/clang/lib/Analysis/ExprMutationAnalyzer.cpp
+++ b/clang/lib/Analysis/ExprMutationAnalyzer.cpp
@@ -55,23 +55,11 @@ static bool canExprResolveTo(const Expr *Source, const Expr *Target) {
// This is matched by `IgnoreDerivedToBase(canResolveToExpr(InnerMatcher))`
// below.
const auto ConditionalOperatorM = [Target](const Expr *E) {
- if (const auto *OP = dyn_cast<ConditionalOperator>(E)) {
- if (const auto *TE = OP->getTrueExpr()->IgnoreParens())
+ if (const auto *CO = dyn_cast<AbstractConditionalOperator>(E)) {
+ if (const auto *TE = CO->getTrueExpr()->IgnoreParens())
if (canExprResolveTo(TE, Target))
return true;
- if (const auto *FE = OP->getFalseExpr()->IgnoreParens())
- if (canExprResolveTo(FE, Target))
- return true;
- }
- return false;
- };
-
- const auto ElvisOperator = [Target](const Expr *E) {
- if (const auto *OP = dyn_cast<BinaryConditionalOperator>(E)) {
- if (const auto *TE = OP->getTrueExpr()->IgnoreParens())
- if (canExprResolveTo(TE, Target))
- return true;
- if (const auto *FE = OP->getFalseExpr()->IgnoreParens())
+ if (const auto *FE = CO->getFalseExpr()->IgnoreParens())
if (canExprResolveTo(FE, Target))
return true;
}
@@ -81,8 +69,7 @@ static bool canExprResolveTo(const Expr *Source, const Expr *Target) {
const Expr *SourceExprP = Source->IgnoreParens();
return IgnoreDerivedToBase(SourceExprP,
[&](const Expr *E) {
- return E == Target || ConditionalOperatorM(E) ||
- ElvisOperator(E);
+ return E == Target || ConditionalOperatorM(E);
}) ||
EvalCommaExpr(SourceExprP, [&](const Expr *E) {
return IgnoreDerivedToBase(
|
5chmidti
approved these changes
Dec 4, 2024
Contributor
5chmidti
left a comment
5chmidti
left a comment
There was a problem hiding this comment.
LGTM
(maybe combine the ifs: const auto* TE...; TE && ... as a cleanup?)
HerrCai0907
force-pushed
the
refactor-mutation-analyzer
branch
from
d5fd3c5 to
5746174
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.