Author: sureyeaah
Date: Wed Oct 2 06:52:14 2019
New Revision: 373472
URL: http://llvm.org/viewvc/llvm-project?rev=373472&view=rev
Log:
[Clangd] ExtractFunction: Don't extract body of enclosing function.
Summary:
This patch disable extraction of the body of the enclosing function.
`void f() [[{}]]`
Extracting this CompoundStmt would leave the enclosing function without
a body.
Reviewers: sammccall, kadircet
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, usaxena95, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D68245
Modified:
clang-tools-extra/trunk/clangd/refactor/tweaks/ExtractFunction.cpp
clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp
Modified: clang-tools-extra/trunk/clangd/refactor/tweaks/ExtractFunction.cpp
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/refactor/tweaks/ExtractFunction.cpp?rev=373472&r1=373471&r2=373472&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/refactor/tweaks/ExtractFunction.cpp
(original)
+++ clang-tools-extra/trunk/clangd/refactor/tweaks/ExtractFunction.cpp Wed Oct
2 06:52:14 2019
@@ -225,10 +225,24 @@ computeEnclosingFuncRange(const Function
return toHalfOpenFileRange(SM, LangOpts,
EnclosingFunction->getSourceRange());
}
+// returns true if Child can be a single RootStmt being extracted from
+// EnclosingFunc.
+bool validSingleChild(const Node *Child, const FunctionDecl *EnclosingFunc) {
+ // Don't extract expressions.
+ // FIXME: We should extract expressions that are "statements" i.e. not
+ // subexpressions
+ if (Child->ASTNode.get<Expr>())
+ return false;
+ // Extracting the body of EnclosingFunc would remove it's definition.
+ assert(EnclosingFunc->hasBody() &&
+ "We should always be extracting from a function body.");
+ if (Child->ASTNode.get<Stmt>() == EnclosingFunc->getBody())
+ return false;
+ return true;
+}
+
// FIXME: Check we're not extracting from the initializer/condition of a
control
// flow structure.
-// FIXME: Check that we don't extract the compound statement of the
-// enclosingFunction.
llvm::Optional<ExtractionZone> findExtractionZone(const Node *CommonAnc,
const SourceManager &SM,
const LangOptions &LangOpts)
{
@@ -236,15 +250,14 @@ llvm::Optional<ExtractionZone> findExtra
ExtZone.Parent = getParentOfRootStmts(CommonAnc);
if (!ExtZone.Parent || ExtZone.Parent->Children.empty())
return llvm::None;
- // Don't extract expressions.
- // FIXME: We should extract expressions that are "statements" i.e. not
- // subexpressions
- if (ExtZone.Parent->Children.size() == 1 &&
- ExtZone.getLastRootStmt()->ASTNode.get<Expr>())
- return llvm::None;
ExtZone.EnclosingFunction = findEnclosingFunction(ExtZone.Parent);
if (!ExtZone.EnclosingFunction)
return llvm::None;
+ // When there is a single RootStmt, we must check if it's valid for
+ // extraction.
+ if (ExtZone.Parent->Children.size() == 1 &&
+ !validSingleChild(ExtZone.getLastRootStmt(), ExtZone.EnclosingFunction))
+ return llvm::None;
if (auto FuncRange =
computeEnclosingFuncRange(ExtZone.EnclosingFunction, SM, LangOpts))
ExtZone.EnclosingFuncRange = *FuncRange;
Modified: clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp?rev=373472&r1=373471&r2=373472&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp (original)
+++ clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp Wed Oct 2 06:52:14
2019
@@ -632,6 +632,13 @@ void f(const int c) {
// Shouldn't crash.
EXPECT_EQ(apply("void f([[int a]]);"), "unavailable");
+ // Don't extract if we select the entire function body (CompoundStmt).
+ std::string CompoundFailInput = R"cpp(
+ void f() [[{
+ int a;
+ }]]
+ )cpp";
+ EXPECT_EQ(apply(CompoundFailInput), "unavailable");
}
TEST_F(ExtractFunctionTest, ControlFlow) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
