OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[clangd] Disable extract variable for RHS of assignments 

Differential Revision: https://reviews.llvm.org/D89307
This commit is contained in:
Kadir Cetinkaya 2020-10-13 13:05:36 +02:00
parent 73c6beb2f7
commit 82a71822a5
No known key found for this signature in database
GPG Key ID: E39E36B8D2057ED6
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang-tools-extra/clangd/refactor/tweaks/ExtractVariable.cpp
View File

@ -382,17 +382,27 @@ bool eligibleForExtraction(const SelectionTree::Node *N) {
if (BinOp.parse(*N) && BinaryOperator::isAssignmentOp(BinOp.Kind)) if (BinOp.parse(*N) && BinaryOperator::isAssignmentOp(BinOp.Kind))
return false; return false;
const SelectionTree::Node &OuterImplicit = N->outerImplicit();
const auto *Parent = OuterImplicit.Parent;
if (!Parent)
return false;
// We don't want to extract expressions used as statements, that would leave // We don't want to extract expressions used as statements, that would leave
// a `dummy;` around that has no effect. // a `dummy;` around that has no effect.
// Unfortunately because the AST doesn't have ExprStmt, we have to check in // Unfortunately because the AST doesn't have ExprStmt, we have to check in
// this roundabout way. // this roundabout way.
const SelectionTree::Node &OuterImplicit = N->outerImplicit(); if (childExprIsStmt(Parent->ASTNode.get<Stmt>(),
if (!OuterImplicit.Parent ||
childExprIsStmt(OuterImplicit.Parent->ASTNode.get<Stmt>(),
OuterImplicit.ASTNode.get<Expr>())) OuterImplicit.ASTNode.get<Expr>()))
return false; return false;
// FIXME: ban extracting the RHS of an assignment: `a = [[foo()]]` // Disable extraction of full RHS on assignment operations, e.g:
// auto x = [[RHS_EXPR]];
// This would just result in duplicating the code.
if (const auto *BO = Parent->ASTNode.get<BinaryOperator>()) {
if (BO->isAssignmentOp() &&
BO->getRHS() == OuterImplicit.ASTNode.get<Expr>())
return false;
}
return true; return true;
} }

23
clang-tools-extra/clangd/unittests/TweakTests.cpp
View File

@ -215,26 +215,26 @@ TEST_F(ExtractVariableTest, Test) {
int x = [[1]], y = [[a + 1]], a = [[1]], z = a + 1; int x = [[1]], y = [[a + 1]], a = [[1]], z = a + 1;
// if without else // if without else
if([[1]]) if([[1]])
a = [[1]]; a = [[1]] + 1;
// if with else // if with else
if(a < [[3]]) if(a < [[3]])
if(a == [[4]]) if(a == [[4]])
a = [[5]]; a = [[5]] + 1;
else else
a = [[5]]; a = [[5]] + 1;
else if (a < [[4]]) else if (a < [[4]])
a = [[4]]; a = [[4]] + 1;
else else
a = [[5]]; a = [[5]] + 1;
// for loop // for loop
for(a = [[1]]; a > [[[[3]] + [[4]]]]; a++) for(a = [[1]] + 1; a > [[[[3]] + [[4]]]]; a++)
a = [[2]]; a = [[2]] + 1;
// while // while
while(a < [[1]]) while(a < [[1]])
a = [[1]]; a = [[1]] + 1;
// do while // do while
do do
a = [[1]]; a = [[1]] + 1;
while(a < [[3]]); while(a < [[3]]);
} }
)cpp"; )cpp";
@ -291,6 +291,7 @@ TEST_F(ExtractVariableTest, Test) {
xyz([[a *= 5]]); xyz([[a *= 5]]);
// Variable DeclRefExpr // Variable DeclRefExpr
a = [[b]]; a = [[b]];
a = [[xyz()]];
// statement expression // statement expression
[[xyz()]]; [[xyz()]];
while (a) while (a)
@ -373,10 +374,10 @@ TEST_F(ExtractVariableTest, Test) {
})cpp"}, })cpp"},
// attribute testing // attribute testing
{R"cpp(void f(int a) { {R"cpp(void f(int a) {
[ [gsl::suppress("type")] ] for (;;) a = [[1]]; [ [gsl::suppress("type")] ] for (;;) a = [[1]] + 1;
})cpp", })cpp",
R"cpp(void f(int a) { R"cpp(void f(int a) {
auto dummy = 1; [ [gsl::suppress("type")] ] for (;;) a = dummy; auto dummy = 1; [ [gsl::suppress("type")] ] for (;;) a = dummy + 1;
})cpp"}, })cpp"},
// MemberExpr // MemberExpr
{R"cpp(class T { {R"cpp(class T {