[clangd] Catch an unchecked "Expected<T>" in HeaderSourceSwitch.
Summary: Also fixes a potential user-after-scope issue of "Path".
Reviewers: kadircet
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, usaxena95, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D68564
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@373897 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/clangd/ClangdLSPServer.cpp b/clangd/ClangdLSPServer.cpp
index 692bd24..ea15176 100644
--- a/clangd/ClangdLSPServer.cpp
+++ b/clangd/ClangdLSPServer.cpp
@@ -1045,7 +1045,7 @@
if (!Path)
return Reply(Path.takeError());
if (*Path)
- Reply(URIForFile::canonicalize(**Path, Params.uri.file()));
+ return Reply(URIForFile::canonicalize(**Path, Params.uri.file()));
return Reply(llvm::None);
});
}
diff --git a/clangd/ClangdServer.cpp b/clangd/ClangdServer.cpp
index b59bb41..4f1fe8f 100644
--- a/clangd/ClangdServer.cpp
+++ b/clangd/ClangdServer.cpp
@@ -460,7 +460,7 @@
if (auto CorrespondingFile =
getCorrespondingHeaderOrSource(Path, FSProvider.getFileSystem()))
return CB(std::move(CorrespondingFile));
- auto Action = [Path, CB = std::move(CB),
+ auto Action = [Path = Path.str(), CB = std::move(CB),
this](llvm::Expected<InputsAndAST> InpAST) mutable {
if (!InpAST)
return CB(InpAST.takeError());
diff --git a/clangd/HeaderSourceSwitch.cpp b/clangd/HeaderSourceSwitch.cpp
index 535c8d6..06ad71d 100644
--- a/clangd/HeaderSourceSwitch.cpp
+++ b/clangd/HeaderSourceSwitch.cpp
@@ -86,7 +86,9 @@
if (auto TargetPath = URI::resolve(TargetURI, OriginalFile)) {
if (*TargetPath != OriginalFile) // exclude the original file.
++Candidates[*TargetPath];
- };
+ } else {
+ elog("Failed to resolve URI {0}: {1}", TargetURI, TargetPath.takeError());
+ }
};
// If we switch from a header, we are looking for the implementation
// file, so we use the definition loc; otherwise we look for the header file,
diff --git a/clangd/unittests/HeaderSourceSwitchTests.cpp b/clangd/unittests/HeaderSourceSwitchTests.cpp
index 3b5fe86..19838af 100644
--- a/clangd/unittests/HeaderSourceSwitchTests.cpp
+++ b/clangd/unittests/HeaderSourceSwitchTests.cpp
@@ -125,6 +125,7 @@
Testing.HeaderCode = R"cpp(
void B_Sym1();
void B_Sym2();
+ void B_Sym3_NoDef();
)cpp";
Testing.Filename = "b.cpp";
Testing.Code = R"cpp(
@@ -163,6 +164,12 @@
void B_Sym1();
)cpp",
testPath("a.cpp")},
+
+ {R"cpp(
+ // We don't have definition in the index, so stay in the header.
+ void B_Sym3_NoDef();
+ )cpp",
+ None},
};
for (const auto &Case : TestCases) {
TestTU TU = TestTU::withCode(Case.HeaderCode);