Print default template argument if manually specified in typedef declaration.

[reikdas]

Summary

If a default template type argument is manually specified to be of the default type, then it is committed when printing the template.

[rjmccall]

LGTM

[dblaikie]

clang/test/SemaTemplate/class-template-id.cpp

12–14

FWIW, looks like this was a reduction in quality - printing the value of the default argument in these error messages, when omitting it was probably desirable?

& doesn't seem to be a necessary consequence of the patch description's goals.

[dblaikie]

clang/test/SemaTemplate/class-template-id.cpp

12–14

Nevermind - I was looking at the parameter types, not the return type. I see the return type is written out more explicitly, so it makes sense that that fuller name be rendered in the message too.

clang/lib/AST/TypePrinter.cpp

if (!Policy.SuppressScope)
       AppendScope(TD->getDeclContext(), OS, TD->getDeclName());
 
     IdentifierInfo *II = TD->getIdentifier();
     OS << II->getName();
   } else {
     T->getTemplateName().print(OS, Policy);
   }
 
-  const TemplateParameterList *TPL = TD ? TD->getTemplateParameters() : nullptr;
-  printTemplateArgumentList(OS, T->template_arguments(), Policy, TPL);
+  printTemplateArgumentList(OS, T->template_arguments(), Policy);
   spaceBeforePlaceHolder(OS);
 }
 
 void TypePrinter::printTemplateSpecializationBefore(
                                             const TemplateSpecializationType *T,
                                             raw_ostream &OS) {
   printTemplateId(T, OS, false);
 }

clang/test/SemaTemplate/class-template-id.cpp

 // RUN: %clang_cc1 -fsyntax-only -verify %s
 template<typename T, typename U = float> struct A { };
 
 typedef A<int> A_int;
 
 typedef float FLOAT;
 
 A<int, FLOAT> *foo(A<int> *ptr, A<int> const *ptr2, A<int, double> *ptr3) {
   if (ptr)
     return ptr; // okay
   else if (ptr2)
-    return ptr2; // expected-error{{cannot initialize return object of type 'A<int> *' with an lvalue of type 'const A<int> *'}}
+    return ptr2; // expected-error{{cannot initialize return object of type 'A<int, FLOAT> *' (aka 'A<int, float> *') with an lvalue of type 'const A<int> *'}}
   else {
-    return ptr3; // expected-error{{cannot initialize return object of type 'A<int> *' with an lvalue of type 'A<int, double> *'}}
+    return ptr3; // expected-error{{cannot initialize return object of type 'A<int, FLOAT> *' (aka 'A<int, float> *') with an lvalue of type 'A<int, double> *'}}
   }
 }
 
 template<int I> struct B;
 
 const int value = 12;
 B<17 + 2> *bar(B<(19)> *ptr1, B< (::value + 7) > *ptr2, B<19 - 3> *ptr3) {
   if (ptr1)

clang/test/SemaTemplate/default-arguments-ast-print.cpp

 // RUN: %clang_cc1 -fsyntax-only -ast-print %s | FileCheck %s
 
 template <typename T, typename U = double> class Foo;
 
 template <> class Foo<int, double> { int method1(); };
 
 using int_type = int;
 
 int Foo<int_type, double>::method1() {
   // CHECK: int Foo<int_type, double>::method1()
   return 10;
 }
+
+int test_typedef() {
+  typedef Foo<int, double> TypedefArg;
+  // CHECK: typedef Foo<int, double> TypedefArg;
+  return 10;
+}
+
+int test_typedef2() {
+  typedef Foo<int> TypedefArg;
+  // CHECK: typedef Foo<int> TypedefArg;
+  return 10;
+}