[index] Fix crash with indexing designated init expressions inside templates.

rdar://27452869

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@277570 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Index/IndexBody.cpp b/lib/Index/IndexBody.cpp
index 4908d852e896f4e35c917b5aac5d39c642bccb56..62f4e8802ae177737f33ada9393fbc086904bec6 100644 (file)
--- a/lib/Index/IndexBody.cpp
+++ b/lib/Index/IndexBody.cpp
@@ -148,7 +148,7 @@ public:
 
   bool VisitDesignatedInitExpr(DesignatedInitExpr *E) {
     for (DesignatedInitExpr::Designator &D : llvm::reverse(E->designators())) {
-      if (D.isFieldDesignator())
+      if (D.isFieldDesignator() && D.getField())
         return IndexCtx.handleReference(D.getField(), D.getFieldLoc(), Parent,
                                         ParentDC, SymbolRoleSet(), {}, E);
     }

diff --git a/test/Index/Core/index-source.cpp b/test/Index/Core/index-source.cpp
index 75c6396da553c533c60f3472b2df9ae631eb5c3e..c4e12903f6cd379c89260175da658336f0193c49 100644 (file)
--- a/test/Index/Core/index-source.cpp
+++ b/test/Index/Core/index-source.cpp
@@ -7,3 +7,15 @@ class TemplCls {
   // CHECK: [[@LINE-1]]:3 | constructor/C++ | TemplCls | c:@ST>1#T@TemplCls@F@TemplCls#I# | <no-cgname> | Decl,RelChild | rel: 1
   // CHECK-NEXT: RelChild | TemplCls | c:@ST>1#T@TemplCls
 };
+
+template <typename T>
+class BT {
+  struct KLR {
+    int idx;
+  };
+
+  // CHECK: [[@LINE+1]]:7 | instance-method/C++ | foo |
+  KLR foo() {
+    return { .idx = 0 }; // Make sure this doesn't trigger a crash.
+  }
+};