[PATCH] D54553: [clangd] Fix crash hovering on non-decltype trailing return
Marc-Andre Laperle via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Fri Nov 16 16:44:00 PST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rL347119: [clangd] Fix crash hovering on non-decltype trailing return (authored by malaperle, committed by ).
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D54553?vs=174202&id=174482#toc
Repository:
rL LLVM
https://reviews.llvm.org/D54553
Files:
clang-tools-extra/trunk/clangd/XRefs.cpp
clang-tools-extra/trunk/unittests/clangd/XRefsTests.cpp
Index: clang-tools-extra/trunk/clangd/XRefs.cpp
===================================================================
--- clang-tools-extra/trunk/clangd/XRefs.cpp
+++ clang-tools-extra/trunk/clangd/XRefs.cpp
@@ -605,6 +605,7 @@
// Handle auto return types:
//- auto foo() {}
//- auto& foo() {}
+ //- auto foo() -> int {}
//- auto foo() -> decltype(1+1) {}
//- operator auto() const { return 10; }
bool VisitFunctionDecl(FunctionDecl *D) {
@@ -624,12 +625,13 @@
const AutoType *AT = D->getReturnType()->getContainedAutoType();
if (AT && !AT->getDeducedType().isNull()) {
DeducedType = AT->getDeducedType();
- } else {
+ } else if (auto DT = dyn_cast<DecltypeType>(D->getReturnType())) {
// auto in a trailing return type just points to a DecltypeType and
// getContainedAutoType does not unwrap it.
- const DecltypeType *DT = dyn_cast<DecltypeType>(D->getReturnType());
if (!DT->getUnderlyingType().isNull())
DeducedType = DT->getUnderlyingType();
+ } else if (!D->getReturnType().isNull()) {
+ DeducedType = D->getReturnType();
}
return true;
}
Index: clang-tools-extra/trunk/unittests/clangd/XRefsTests.cpp
===================================================================
--- clang-tools-extra/trunk/unittests/clangd/XRefsTests.cpp
+++ clang-tools-extra/trunk/unittests/clangd/XRefsTests.cpp
@@ -836,6 +836,14 @@
"",
},
{
+ R"cpp(// simple trailing return type
+ ^auto main() -> int {
+ return 0;
+ }
+ )cpp",
+ "int",
+ },
+ {
R"cpp(// auto function return with trailing type
struct Bar {};
^auto test() -> decltype(Bar()) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54553.174482.patch
Type: text/x-patch
Size: 1760 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20181117/ec3e0f94/attachment-0001.bin>
More information about the cfe-commits
mailing list