Author: Haojian Wu Date: 2022-08-12T14:37:46+02:00 New Revision: 06b97b4985ad0415f6cde4baad2bc7d73b456244
URL: https://github.com/llvm/llvm-project/commit/06b97b4985ad0415f6cde4baad2bc7d73b456244 DIFF: https://github.com/llvm/llvm-project/commit/06b97b4985ad0415f6cde4baad2bc7d73b456244.diff LOG: [clangd] Fix an inlay-hint crash on a broken designator. Differential Revision: https://reviews.llvm.org/D131696 Added: Modified: clang-tools-extra/clangd/InlayHints.cpp clang-tools-extra/clangd/unittests/InlayHintTests.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/InlayHints.cpp b/clang-tools-extra/clangd/InlayHints.cpp index 8983f6b7a9eb8..bff07dd078cc9 100644 --- a/clang-tools-extra/clangd/InlayHints.cpp +++ b/clang-tools-extra/clangd/InlayHints.cpp @@ -141,8 +141,10 @@ void collectDesignators(const InitListExpr *Sem, Fields.next(); // Always advance to the next subobject name. Prefix.resize(Size); // Erase any designator we appended. }); - if (llvm::isa<ImplicitValueInitExpr>(Init)) - continue; // a "hole" for a subobject that was not explicitly initialized + // Skip for a broken initializer or if it is a "hole" in a subobject that + // was not explicitly initialized. + if (!Init || llvm::isa<ImplicitValueInitExpr>(Init)) + continue; const auto *BraceElidedSubobject = llvm::dyn_cast<InitListExpr>(Init); if (BraceElidedSubobject && diff --git a/clang-tools-extra/clangd/unittests/InlayHintTests.cpp b/clang-tools-extra/clangd/unittests/InlayHintTests.cpp index 87bb0cfc01f60..a429c08991879 100644 --- a/clang-tools-extra/clangd/unittests/InlayHintTests.cpp +++ b/clang-tools-extra/clangd/unittests/InlayHintTests.cpp @@ -1417,6 +1417,17 @@ TEST(DesignatorHints, OnlyAggregateInit) { )cpp" /*no designator hints expected (but param hints!)*/); } +TEST(DesignatorHints, NoCrash) { + assertDesignatorHints(R"cpp( + /*error-ok*/ + struct A {}; + struct Foo {int a; int b;}; + void test() { + Foo f{A(), $b[[1]]}; + } + )cpp", ExpectedHint{".b=", "b"}); +} + TEST(InlayHints, RestrictRange) { Annotations Code(R"cpp( auto a = false; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits