[CIR][NFC] Simplify struct type name creation

During review of a patch for upstreaming the cir.struct type support, Erich
Keane observed that the code we use for creating our type name for
structures with templates was likely to be error prone. He recommended
using getNameForDiagnostic instead.

After some experimentation, I found that with a couple of changes to the
printing policy, I could get the same strings we currently produce by
calling getNameForDiagnostic. This change does that.

Erich also pointed out that RecordDecls always have a DeclContext so
a few other lines could be eliminated where that was checked.

Author: andykaylor

clang/lib/CIR/CodeGen/CIRGenTypes.cpp

@@ -61,31 +61,13 @@ std::string CIRGenTypes::getRecordTypeName(const clang::RecordDecl *recordDecl,
 
   PrintingPolicy policy = recordDecl->getASTContext().getPrintingPolicy();
   policy.SuppressInlineNamespace = false;
+  policy.AlwaysIncludeTypeForTemplateArgument = true;
+  policy.PrintCanonicalTypes = true;
 
   if (recordDecl->getIdentifier()) {
-    if (recordDecl->getDeclContext())
-      recordDecl->printQualifiedName(outStream, policy);
-    else
-      recordDecl->printName(outStream, policy);
-
-    // Ensure each template specialization has a unique name.
-    if (auto *templateSpecialization =
-            llvm::dyn_cast<ClassTemplateSpecializationDecl>(recordDecl)) {
-      outStream << '<';
-      const auto args = templateSpecialization->getTemplateArgs().asArray();
-      const auto printer = [&policy, &outStream](const TemplateArgument &arg) {
-        /// Print this template argument to the given output stream.
-        arg.print(policy, outStream, /*IncludeType=*/true);
-      };
-      llvm::interleaveComma(args, outStream, printer);
-      outStream << '>';
-    }
-
+    recordDecl->getNameForDiagnostic(outStream, policy, true);
   } else if (auto *typedefNameDecl = recordDecl->getTypedefNameForAnonDecl()) {
-    if (typedefNameDecl->getDeclContext())
-      typedefNameDecl->printQualifiedName(outStream, policy);
-    else
-      typedefNameDecl->printName(outStream);
+    typedefNameDecl->printQualifiedName(outStream, policy);
   } else {
     outStream << Builder.getUniqueAnonRecordName();
   }

clang/test/CIR/CodeGen/sourcelocation.cpp

@@ -84,7 +84,7 @@ int s0(int a, int b) {
 // LLVM: !llvm.module.flags = !{!2}
 
 // LLVM: !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "MLIR", isOptimized: true, runtimeVersion: 0, emissionKind: LineTablesOnly)
-// LLVM: !1 = !DIFile(filename: "sourcelocation.cpp", directory: "/data/users/lanza/Projects/clangir/clang/test/CIR/CodeGen")
+// LLVM: !1 = !DIFile(filename: "sourcelocation.cpp", directory: "{{.*}}clang/test/CIR/CodeGen")
 // LLVM: !2 = !{i32 2, !"Debug Info Version", i32 3}
 // LLVM: !3 = distinct !DISubprogram(name: "_Z2s0ii", linkageName: "_Z2s0ii", scope: !1, file: !1, line: 6, type: !4, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0)
 // LLVM: !4 = !DISubroutineType(cc: DW_CC_normal, types: !5)