diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index eb3f104f7eb9..d8ba5592ad47 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -5040,6 +5040,10 @@ struct ReconstitutableType : public RecursiveASTVisitor<ReconstitutableType> {
         Reconstitutable = false;
         return false;
       }
+      if (!ED->isExternallyVisible()) {
+        Reconstitutable = false;
+        return false;
+      }
     }
     return true;
   }
diff --git a/clang/test/CodeGenCXX/debug-info-simple-template-names.cpp b/clang/test/CodeGenCXX/debug-info-simple-template-names.cpp
index 344bd93020f6..06e83ea6f59e 100644
--- a/clang/test/CodeGenCXX/debug-info-simple-template-names.cpp
+++ b/clang/test/CodeGenCXX/debug-info-simple-template-names.cpp
@@ -16,6 +16,17 @@ struct t2 {
 };
 template <template <typename...> class T>
 void f3() {}
+namespace {
+enum LocalEnum { LocalEnum1 };
+}
+template<typename T, T ... ts>
+struct t3 { };
+struct t4 {
+  t3<LocalEnum, LocalEnum1> m1;
+};
+  
+t4 v1;
+// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "t3<(anonymous namespace)::LocalEnum, (anonymous namespace)::LocalEnum1>"
 void f() {
   // Basic examples of simplifiable/rebuildable names
   f1<>();
diff --git a/cross-project-tests/debuginfo-tests/clang_llvm_roundtrip/simplified_template_names.cpp b/cross-project-tests/debuginfo-tests/clang_llvm_roundtrip/simplified_template_names.cpp
index d608039959df..898b27ec0e47 100644
--- a/cross-project-tests/debuginfo-tests/clang_llvm_roundtrip/simplified_template_names.cpp
+++ b/cross-project-tests/debuginfo-tests/clang_llvm_roundtrip/simplified_template_names.cpp
@@ -53,6 +53,7 @@ template<unsigned N>
 struct t4 { };
 namespace {
 struct t5 { };
+enum LocalEnum { LocalEnum1 };
 }
 template<typename ...T1, typename T2 = int>
 void f5() { }
@@ -167,6 +168,14 @@ template<typename T>
 void operator_not_really() {
 }
 
+template<typename T, T ...A>
+struct t11 {
+};
+
+struct t12 {
+  t11<LocalEnum, LocalEnum1> v1;
+};
+
 int main() {
   struct { } A;
   auto L = []{};
@@ -198,6 +207,7 @@ int main() {
   f3<ns::EnumerationClass, ns::EnumerationClass::Enumerator3, (ns::EnumerationClass)2>();
   f3<ns::EnumerationSmall, ns::kNeg>();
   f3<decltype(ns::AnonEnum1), ns::AnonEnum3, (decltype(ns::AnonEnum1))2>();
+  f3<LocalEnum, LocalEnum1>();
   f3<int*, &i>();
   f3<int*, nullptr>();
   t4<3> v2;
@@ -305,6 +315,7 @@ int main() {
   f1<void(t8, decltype(A))>();
   f1<void(t8)>();
   operator_not_really<int>();
+  t12 v4;
 }
 void t8::mem() {
   struct t7 { };