<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Apr 16, 2014 at 5:30 PM, Adrian Prantl <span dir="ltr"><<a href="mailto:aprantl@apple.com" target="_blank">aprantl@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br>
Date: Wed Apr 16 19:30:48 2014<br>
New Revision: 206430<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=206430&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=206430&view=rev</a><br>
Log:<br>
Debug info: When collecting the parameters of C++ partial template<br>
specializations collect all arguments and not just the ones from the<br>
class template partial specialization from which this class template<br>
specialization was instantiated. The debug info does not represent the<br>
partial specialization otherwise and so specialized parameters would<br>
go missing.<br>
<br>
rdar://problem/16636569.<br>
<br>
Added:<br>
    cfe/trunk/test/CodeGenCXX/debug-info-template-partial-specialization.cpp<br>
Modified:<br>
    cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=206430&r1=206429&r2=206430&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=206430&r1=206429&r2=206430&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Wed Apr 16 19:30:48 2014<br>
@@ -1360,10 +1360,16 @@ CollectCXXTemplateParams(const ClassTemp<br>
                      ClassTemplatePartialSpecializationDecl *><br>
     PU = TSpecial->getSpecializedTemplateOrPartial();<br>
<br>
-  TemplateParameterList *TPList = PU.is<ClassTemplateDecl *>() ?<br>
-    PU.get<ClassTemplateDecl *>()->getTemplateParameters() :<br>
-    PU.get<ClassTemplatePartialSpecializationDecl *>()->getTemplateParameters();<br>
-  const TemplateArgumentList &TAList = TSpecial->getTemplateInstantiationArgs();<br>
+  TemplateParameterList *TPList;<br>
+  if (auto *CTD = PU.dyn_cast<ClassTemplateDecl *>())<br>
+    TPList = CTD->getTemplateParameters();<br>
+  else {<br>
+    // Always get the full list of parameters, not just the ones from<br>
+    // the specialization.<br>
+    auto *CTPSD = PU.get<ClassTemplatePartialSpecializationDecl *>();<br>
+    TPList = CTPSD->getSpecializedTemplate()->getTemplateParameters();<br>
+  }<br></blockquote><div><br></div><div>This is over-complicated; it's equivalent to:</div><div><br></div><div>TPList = TSpecial->getSpecializedTemplate()->getTemplateParameters();</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

+  const TemplateArgumentList &TAList = TSpecial->getTemplateArgs();<br>
   return CollectTemplateParams(TPList, TAList.asArray(), Unit);<br>
 }<br>
<br>
<br>
Added: cfe/trunk/test/CodeGenCXX/debug-info-template-partial-specialization.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-template-partial-specialization.cpp?rev=206430&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-template-partial-specialization.cpp?rev=206430&view=auto</a><br>

==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/debug-info-template-partial-specialization.cpp (added)<br>
+++ cfe/trunk/test/CodeGenCXX/debug-info-template-partial-specialization.cpp Wed Apr 16 19:30:48 2014<br>
@@ -0,0 +1,31 @@<br>
+// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -g %s -o - -fstandalone-debug | FileCheck %s<br>
+namespace __pointer_type_imp<br>
+{<br>
+  template <class _Tp, class _Dp, bool > struct __pointer_type1 {};<br>
+<br>
+  // CHECK: metadata ![[PARAMS:[0-9]+]], metadata !"_ZTSN18__pointer_type_imp15__pointer_type1I1C14default_deleteIS1_ELb0EEE"} ; [ DW_TAG_structure_type ] [__pointer_type1<C, default_delete<C>, false>] [line [[@LINE+1]], size 8, align 8, offset 0] [def] [from ]<br>

+  template <class _Tp, class _Dp> struct __pointer_type1<_Tp, _Dp, false><br>
+  {<br>
+    typedef _Tp* type;<br>
+  };<br>
+}<br>
+template <class _Tp, class _Dp><br>
+struct __pointer_type2<br>
+{<br>
+  // Test that the bool template type parameter is emitted.<br>
+  //<br>
+  // CHECK: ![[PARAMS]] = metadata !{metadata !{{.*}}, metadata !{{.*}}, metadata ![[FALSE:[0-9]+]]}<br>
+  // CHECK: ![[FALSE]] = {{.*}} i8 0, {{.*}}} ; [ DW_TAG_template_value_parameter ]<br>
+  typedef typename __pointer_type_imp::__pointer_type1<_Tp, _Dp, false>::type type;<br>
+};<br>
+template <class _Tp> struct default_delete {};<br>
+template <class _Tp, class _Dp = default_delete<_Tp> > class unique_ptr<br>
+{<br>
+  typedef typename __pointer_type2<_Tp, _Dp>::type pointer;<br>
+  unique_ptr(pointer __p, _Dp __d) {}<br>
+};<br>
+class C {<br>
+  unique_ptr<C> Ptr;<br>
+};<br>
+void foo(C &c) {<br>
+}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>