This revision was automatically updated to reflect the committed changes.
Closed by commit rG7ac10e5b347f: [clangd] Fix a crash in ExtractFunction tweak.
(authored by hokein).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D135857/new/
https://reviews.llvm.org/D135857
Files:
clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp
clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp
Index: clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp
+++ clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp
@@ -182,6 +182,7 @@
// Shouldn't crash.
EXPECT_EQ(apply("void f([[int a]]);"), "unavailable");
+ EXPECT_EQ(apply("void f(int a = [[1]]);"), "unavailable");
// Don't extract if we select the entire function body (CompoundStmt).
std::string CompoundFailInput = R"cpp(
void f() [[{
Index: clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp
===================================================================
--- clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp
+++ clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp
@@ -248,6 +248,8 @@
// FIXME: Support extraction from templated functions.
if (Func->isTemplated())
return nullptr;
+ if (!Func->getBody())
+ return nullptr;
for (const auto *S : Func->getBody()->children()) {
// During apply phase, we perform semantic analysis (e.g. figure out
// what variables requires hoisting). We cannot perform those when the
Index: clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp
+++ clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp
@@ -182,6 +182,7 @@
// Shouldn't crash.
EXPECT_EQ(apply("void f([[int a]]);"), "unavailable");
+ EXPECT_EQ(apply("void f(int a = [[1]]);"), "unavailable");
// Don't extract if we select the entire function body (CompoundStmt).
std::string CompoundFailInput = R"cpp(
void f() [[{
Index: clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp
===================================================================
--- clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp
+++ clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp
@@ -248,6 +248,8 @@
// FIXME: Support extraction from templated functions.
if (Func->isTemplated())
return nullptr;
+ if (!Func->getBody())
+ return nullptr;
for (const auto *S : Func->getBody()->children()) {
// During apply phase, we perform semantic analysis (e.g. figure out
// what variables requires hoisting). We cannot perform those when the
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
