[PATCH] D56916: Fix crash due to ObjCPropertyDecl
David Goldman via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue Jan 22 10:27:44 PST 2019
dgoldman updated this revision to Diff 182942.
dgoldman added a comment.
Herald added a subscriber: jfb.
- FIXME and dyn_cast
- use auto
- Add test
Repository:
rCTE Clang Tools Extra
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D56916/new/
https://reviews.llvm.org/D56916
Files:
clangd/index/SymbolCollector.cpp
unittests/clangd/SymbolCollectorTests.cpp
Index: unittests/clangd/SymbolCollectorTests.cpp
===================================================================
--- unittests/clangd/SymbolCollectorTests.cpp
+++ unittests/clangd/SymbolCollectorTests.cpp
@@ -437,6 +437,23 @@
QName("MyProtocol"), QName("MyProtocol::someMethodName3:")));
}
+TEST_F(SymbolCollectorTest, ObjCPropertyImpl) {
+ const std::string Header = R"(
+ @interface Container
+ @property(nonatomic) int magic;
+ @end
+
+ @implementation Container
+ @end
+ )";
+ TestFileName = testPath("test.m");
+ runSymbolCollector(Header, /*Main=*/"", {"-xobjective-c++"});
+ EXPECT_THAT(Symbols,
+ UnorderedElementsAre(
+ QName("Container"), QName("Container::magic"),
+ QName("Container::_magic")));
+}
+
TEST_F(SymbolCollectorTest, Locations) {
Annotations Header(R"cpp(
// Declared in header, defined in main.
Index: clangd/index/SymbolCollector.cpp
===================================================================
--- clangd/index/SymbolCollector.cpp
+++ clangd/index/SymbolCollector.cpp
@@ -347,19 +347,25 @@
if (!ID)
return true;
- const NamedDecl &OriginalDecl = *cast<NamedDecl>(ASTNode.OrigD);
+ // FIXME: ObjCPropertyDecl are not properly indexed here:
+ // - ObjCPropertyDecl may have an OrigD of ObjCPropertyImplDecl, which is
+ // not a NamedDecl.
+ auto *OriginalDecl = dyn_cast<NamedDecl>(ASTNode.OrigD);
+ if (!OriginalDecl)
+ return true;
+
const Symbol *BasicSymbol = Symbols.find(*ID);
if (!BasicSymbol) // Regardless of role, ND is the canonical declaration.
BasicSymbol = addDeclaration(*ND, std::move(*ID), IsMainFileOnly);
- else if (isPreferredDeclaration(OriginalDecl, Roles))
+ else if (isPreferredDeclaration(*OriginalDecl, Roles))
// If OriginalDecl is preferred, replace the existing canonical
// declaration (e.g. a class forward declaration). There should be at most
// one duplicate as we expect to see only one preferred declaration per
// TU, because in practice they are definitions.
- BasicSymbol = addDeclaration(OriginalDecl, std::move(*ID), IsMainFileOnly);
+ BasicSymbol = addDeclaration(*OriginalDecl, std::move(*ID), IsMainFileOnly);
if (Roles & static_cast<unsigned>(index::SymbolRole::Definition))
- addDefinition(OriginalDecl, *BasicSymbol);
+ addDefinition(*OriginalDecl, *BasicSymbol);
return true;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56916.182942.patch
Type: text/x-patch
Size: 2435 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190122/5e38de3b/attachment-0001.bin>
More information about the cfe-commits
mailing list