fix(cxx_indexer): handle list-init on incomplete types (#4584)

kythe · Jul 13, 2020 · 0bcb51e · 0bcb51e
1 parent bf8c25a
commit 0bcb51e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/kythe/cxx/indexer/cxx/IndexerASTHooks.cc b/kythe/cxx/indexer/cxx/IndexerASTHooks.cc
@@ -280,12 +280,20 @@ std::string DumpString(const T& val, Tail&&... tail) {
   return s;
 }
 
+bool IsCompleteAggregateType(clang::QualType Type) {
+  if (Type.isNull()) {
+    return false;
+  }
+  Type = Type.getCanonicalType();
+  return !Type->isIncompleteType() && Type->isAggregateType();
+}
+
 llvm::SmallVector<const clang::Decl*, 5> GetInitExprDecls(
     const clang::InitListExpr* ILE) {
   CHECK(ILE->isSemanticForm());
   QualType Type = ILE->getType();
   // Ignore non-aggregate and copy initialization.
-  if (Type.isNull() || !Type->isAggregateType() || ILE->isTransparent()) {
+  if (!IsCompleteAggregateType(Type) || ILE->isTransparent()) {
     return {};
   }
   if (const clang::FieldDecl* Field = ILE->getInitializedFieldInUnion()) {

diff --git a/kythe/cxx/indexer/cxx/testdata/rec/rec_agg_init.cc b/kythe/cxx/indexer/cxx/testdata/rec/rec_agg_init.cc
@@ -4,6 +4,9 @@ struct Default {
   Default();
 };
 
+//- @I defines/binding StructI
+struct I;
+
 //- @S defines/binding StructS
 struct S {
   //- @a defines/binding FieldA
@@ -49,6 +52,8 @@ struct V {
 
 S FromValue();
 
+const I& ReturnsIncomplete();
+
 template <typename...T>
 void fn(T&&...);
 
@@ -91,4 +96,7 @@ void f() {
   //- !{ @#0"}" ref/init _ }
   //- !{ @#1"}" ref/init _ }
   V v{{1}, 2};
+
+  //- @#0I ref StructI
+  const I& i{ReturnsIncomplete()};
 }