diff --git a/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp b/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp --- a/clang-tools-extra/clangd/refactor/tweaks/ExtractFunction.cpp +++ b/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 diff --git a/clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp b/clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp --- a/clang-tools-extra/clangd/unittests/tweaks/ExtractFunctionTests.cpp +++ b/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() [[{