dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[refactor][extract] avoid extracting expressions from types in functions 

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@318169 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alex Lorenz 2017-11-14 18:59:01 +00:00
parent a325b416d2
commit 723b459448
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Tooling/Refactoring/ASTSelection.cpp
View File

@ -383,10 +383,12 @@ bool CodeRangeASTSelection::isInFunctionLikeBodyOfCode() const {
if (const auto *D = Node.get<Decl>()) {
if (isFunctionLikeDeclaration(D))
return IsPrevCompound;
// FIXME (Alex L): We should return false on top-level decls in functions
// e.g. we don't want to extract:
// Stop the search at any type declaration to avoid returning true for
// expressions in type declarations in functions, like:
// function foo() { struct X {
// int m = /*selection:*/ 1 + 2 /*selection end*/; }; };
if (isa<TypeDecl>(D))
return false;
}
IsPrevCompound = Node.get<CompoundStmt>() != nullptr;
}

18
test/Refactor/Extract/ExtractExprIntoFunction.cpp
View File

@ -1,4 +1,4 @@
// RUN: clang-refactor extract -selection=test:%s %s -- -std=c++11 2>&1 | grep -v CHECK | FileCheck %s
// RUN: clang-refactor extract -selection=test:%s %s -- -std=c++14 2>&1 | grep -v CHECK | FileCheck %s
void simpleExtractNoCaptures() {
@ -42,7 +42,21 @@ struct OutOfBodyStuff {
void foo(int x =/*range out_of_body_expr=->+0:58*/1 + 2);
};
// CHECK: 3 'out_of_body_expr' results:
auto inFunctionOutOfBody() -> decltype(/*range out_of_body_expr=->+0:79*/1 + 2) {
struct OutOfBodyStuff {
int FieldInit = /*range out_of_body_expr=->+0:60*/1 + 2;
void foo(int x =/*range out_of_body_expr=->+0:60*/1 + 2);
};
enum E {
X = /*range out_of_body_expr=->+0:48*/1 + 2
};
int x = 0;
using T = decltype(/*range out_of_body_expr=->+0:61*/x + 3);
return x;
}
// CHECK: 8 'out_of_body_expr' results:
// CHECK: the selected code is not a part of a function's / method's body
void simpleExpressionNoExtraction() {