diff options
| -rw-r--r-- | clang-tools-extra/clangd/Hover.cpp | 5 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/unittests/HoverTests.cpp | 18 |
2 files changed, 21 insertions, 2 deletions
diff --git a/clang-tools-extra/clangd/Hover.cpp b/clang-tools-extra/clangd/Hover.cpp index 5bc15629b05..d89dc298ed8 100644 --- a/clang-tools-extra/clangd/Hover.cpp +++ b/clang-tools-extra/clangd/Hover.cpp @@ -242,12 +242,13 @@ void fillFunctionTypeAndParams(HoverInfo &HI, const Decl *D, // FIXME: handle variadics. } -llvm::Optional<std::string> printExprValue(const Expr *E, const ASTContext &Ctx) { +llvm::Optional<std::string> printExprValue(const Expr *E, + const ASTContext &Ctx) { Expr::EvalResult Constant; // Evaluating [[foo]]() as "&foo" isn't useful, and prevents us walking up // to the enclosing call. QualType T = E->getType(); - if (T->isFunctionType() || T->isFunctionPointerType() || + if (T.isNull() || T->isFunctionType() || T->isFunctionPointerType() || T->isFunctionReferenceType()) return llvm::None; // Attempt to evaluate. If expr is dependent, evaluation crashes! diff --git a/clang-tools-extra/clangd/unittests/HoverTests.cpp b/clang-tools-extra/clangd/unittests/HoverTests.cpp index 5862b1d03bf..3cde2948e36 100644 --- a/clang-tools-extra/clangd/unittests/HoverTests.cpp +++ b/clang-tools-extra/clangd/unittests/HoverTests.cpp @@ -506,6 +506,24 @@ void foo())cpp"; HI.NamespaceScope = ""; HI.Value = "&\"1234\"[0]"; }}, + {R"cpp(// Should not crash + template <typename T> + struct Tmpl { + Tmpl(int name); + }; + + template <typename A> + void boom(int name) { + new Tmpl<A>([[na^me]]); + })cpp", + [](HoverInfo &HI) { + HI.Name = "name"; + HI.Definition = "int name"; + HI.Kind = index::SymbolKind::Parameter; + HI.Type = "int"; + HI.NamespaceScope = ""; + HI.LocalScope = "boom::"; + }}, }; for (const auto &Case : Cases) { SCOPED_TRACE(Case.Code); |
