DebugInfo: fix a couple of spurious spaces in simplified template name rebuilding

cross-project-tests/debuginfo-tests/clang_llvm_roundtrip/simplified_template_names.cpp

@@ -321,6 +321,8 @@ int main() {
   t12 v4;
   f1<_BitInt(3)>();
   f1<const unsigned _BitInt(5)>();
+  f1<void(t1<>, t1<>)>();
+  f1<int t1<>::*>();
 }
 void t8::mem() {
   struct t7 { };

llvm/lib/DebugInfo/DWARF/DWARFDie.cpp

@@ -250,6 +250,7 @@ struct DWARFTypePrinter {
         OS << ' ';
       if (DWARFDie Cont = resolveReferencedType(D, DW_AT_containing_type)) {
         appendQualifiedName(Cont);
+        EndedWithTemplate = false;
         OS << "::";
       }
       OS << "*";
@@ -532,8 +533,10 @@ struct DWARFTypePrinter {
       appendQualifiedName(TypeAttr ? resolveReferencedType(C, *TypeAttr)
                                    : DWARFDie());
     }
-    if (IsTemplate && *FirstParameter && FirstParameter == &FirstParameterValue)
+    if (IsTemplate && *FirstParameter && FirstParameter == &FirstParameterValue) {
       OS << '<';
+      EndedWithTemplate = false;
+    }
     return IsTemplate;
   }
   void decomposeConstVolatile(DWARFDie &N, DWARFDie &T, DWARFDie &C,