Merge pull request #2934 from ahoppen/pr-stable/ignore-nullptr-decl-for-indexing

akyrtzi · web-flow · commit 8d4a055e6f9f · 2021-05-07T12:26:10.000-07:00
[Index] Ignore nullptr decls for indexing
diff --git a/clang/lib/Index/IndexDecl.cpp b/clang/lib/Index/IndexDecl.cpp
@@ -759,7 +759,7 @@ bool IndexingContext::indexDeclContext(const DeclContext *DC) {
 }
 
 bool IndexingContext::indexTopLevelDecl(const Decl *D) {
-  if (D->getLocation().isInvalid())
+  if (!D || D->getLocation().isInvalid())
     return true;
 
   if (isa<ObjCMethodDecl>(D))

Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ bool IndexingContext::indexDeclContext(const DeclContext *DC) {`
`759`	`759`	`}`
`760`	`760`
`761`	`761`	`bool IndexingContext::indexTopLevelDecl(const Decl *D) {`
`762`		`- if (D->getLocation().isInvalid())`
	`762`	`+ if (!D \|\| D->getLocation().isInvalid())`
`763`	`763`	`return true;`
`764`	`764`
`765`	`765`	`if (isa<ObjCMethodDecl>(D))`