Index: test/CodeGenCXX/template-inner-struct-visibility-hidden.cpp
===================================================================
--- test/CodeGenCXX/template-inner-struct-visibility-hidden.cpp	(revision 0)
+++ test/CodeGenCXX/template-inner-struct-visibility-hidden.cpp	(revision 0)
@@ -0,0 +1,13 @@
+// RUN: %clang -c -o %t.o -fvisibility=hidden %s && nm -m %t.o | grep __ZN1CIiE5Inner1fEv | grep private
+
+template<typename T>
+struct C {
+  struct Inner {
+    void f();
+  };
+};
+
+template<typename T> void C<T>::Inner::f() { }
+
+extern template struct C<int>;
+template struct C<int>;

Property changes on: test/CodeGenCXX/template-inner-struct-visibility-hidden.cpp
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: lib/Sema/SemaTemplateInstantiate.cpp
===================================================================
--- lib/Sema/SemaTemplateInstantiate.cpp	(revision 114797)
+++ lib/Sema/SemaTemplateInstantiate.cpp	(working copy)
@@ -1447,7 +1447,7 @@
         if (CheckSpecializationInstantiationRedecl(PointOfInstantiation, TSK, 
                                                    Function, 
                                         MSInfo->getTemplateSpecializationKind(),
-                                              MSInfo->getPointOfInstantiation(), 
+                                              MSInfo->getPointOfInstantiation(),
                                                    SuppressNew) ||
             SuppressNew)
           continue;
@@ -1483,7 +1483,7 @@
         if (CheckSpecializationInstantiationRedecl(PointOfInstantiation, TSK, 
                                                    Var, 
                                         MSInfo->getTemplateSpecializationKind(),
-                                              MSInfo->getPointOfInstantiation(), 
+                                              MSInfo->getPointOfInstantiation(),
                                                    SuppressNew) ||
             SuppressNew)
           continue;
@@ -1518,11 +1518,11 @@
       if (MSInfo->getTemplateSpecializationKind()
                                                 == TSK_ExplicitSpecialization)
         continue;
-      
+
       if (CheckSpecializationInstantiationRedecl(PointOfInstantiation, TSK, 
                                                  Record, 
                                         MSInfo->getTemplateSpecializationKind(),
-                                              MSInfo->getPointOfInstantiation(), 
+                                              MSInfo->getPointOfInstantiation(),
                                                  SuppressNew) ||
           SuppressNew)
         continue;
@@ -1549,6 +1549,13 @@
         InstantiateClass(PointOfInstantiation, Record, Pattern,
                          TemplateArgs,
                          TSK);
+      } else {
+        if (TSK == TSK_ExplicitInstantiationDefinition &&
+            Record->getTemplateSpecializationKind() ==
+                TSK_ExplicitInstantiationDeclaration) {
+          Record->setTemplateSpecializationKind(TSK);
+          MarkVTableUsed(PointOfInstantiation, Record, true);
+        }
       }
       
       Pattern = cast_or_null<CXXRecordDecl>(Record->getDefinition());