commit cd4d04d99cfceef83bb7e247f12693e224130762
author swift-ci <swift-ci@users.noreply.github.com> Wed Jul 05 10:23:17 2017 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Wed Jul 05 10:23:17 2017 -0700
tree 6f76683391b747f79aa5289adc6a1bf54bacbcb2
parent 254bddb576bfd272ff7626383e9243e2983bde37
parent 3beb108c19c3686cb6239e9824c3369573dda01b

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable

lib/Index/IndexDecl.cpp

diff --git a/lib/Index/IndexDecl.cpp b/lib/Index/IndexDecl.cpp
index f2435b2..352974c 100644
--- a/lib/Index/IndexDecl.cpp
+++ b/lib/Index/IndexDecl.cpp
@@ -616,6 +616,8 @@
         Template.is<ClassTemplateDecl *>()
             ? (Decl *)Template.get<ClassTemplateDecl *>()
             : Template.get<ClassTemplatePartialSpecializationDecl *>();
+    if (!D->isThisDeclarationADefinition())
+      IndexCtx.indexNestedNameSpecifierLoc(D->getQualifierLoc(), D);
     IndexCtx.indexTagDecl(
         D, SymbolRelation(SymbolRoleSet(SymbolRole::RelationSpecializationOf),
                           SpecializationOf));

test/Index/Core/index-source.cpp

diff --git a/test/Index/Core/index-source.cpp b/test/Index/Core/index-source.cpp
index 6c84c88..c4c1763 100644
--- a/test/Index/Core/index-source.cpp
+++ b/test/Index/Core/index-source.cpp
@@ -479,3 +479,19 @@
 }
 
 }
+
+namespace rd33122110 {
+
+struct Outer {
+    template<typename T>
+    struct Nested { };
+};
+
+}
+
+template<>
+struct rd33122110::Outer::Nested<int>;
+// CHECK: [[@LINE-1]]:8 | namespace/C++ | rd33122110 | c:@N@rd33122110 | <no-cgname> | Ref,RelCont | rel: 1
+// CHECK-NEXT: RelCont | Nested | c:@N@rd33122110@S@Outer@S@Nested>#I
+// CHECK: [[@LINE-3]]:20 | struct/C++ | Outer | c:@N@rd33122110@S@Outer | <no-cgname> | Ref,RelCont | rel: 1
+// CHECK-NEXT: RelCont | Nested | c:@N@rd33122110@S@Outer@S@Nested>#I