Debug info: When collecting the parameters of C++ partial template
specializations collect all arguments and not just the ones from the class template partial specialization from which this class template specialization was instantiated. The debug info does not represent the partial specialization otherwise and so specialized parameters would go missing. rdar://problem/16636569. llvm-svn: 206430
This commit is contained in:
parent
5f6268a40e
commit
2c92e9cb53
|
@ -1360,10 +1360,16 @@ CollectCXXTemplateParams(const ClassTemplateSpecializationDecl *TSpecial,
|
|||
ClassTemplatePartialSpecializationDecl *>
|
||||
PU = TSpecial->getSpecializedTemplateOrPartial();
|
||||
|
||||
TemplateParameterList *TPList = PU.is<ClassTemplateDecl *>() ?
|
||||
PU.get<ClassTemplateDecl *>()->getTemplateParameters() :
|
||||
PU.get<ClassTemplatePartialSpecializationDecl *>()->getTemplateParameters();
|
||||
const TemplateArgumentList &TAList = TSpecial->getTemplateInstantiationArgs();
|
||||
TemplateParameterList *TPList;
|
||||
if (auto *CTD = PU.dyn_cast<ClassTemplateDecl *>())
|
||||
TPList = CTD->getTemplateParameters();
|
||||
else {
|
||||
// Always get the full list of parameters, not just the ones from
|
||||
// the specialization.
|
||||
auto *CTPSD = PU.get<ClassTemplatePartialSpecializationDecl *>();
|
||||
TPList = CTPSD->getSpecializedTemplate()->getTemplateParameters();
|
||||
}
|
||||
const TemplateArgumentList &TAList = TSpecial->getTemplateArgs();
|
||||
return CollectTemplateParams(TPList, TAList.asArray(), Unit);
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -g %s -o - -fstandalone-debug | FileCheck %s
|
||||
namespace __pointer_type_imp
|
||||
{
|
||||
template <class _Tp, class _Dp, bool > struct __pointer_type1 {};
|
||||
|
||||
// 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 ]
|
||||
template <class _Tp, class _Dp> struct __pointer_type1<_Tp, _Dp, false>
|
||||
{
|
||||
typedef _Tp* type;
|
||||
};
|
||||
}
|
||||
template <class _Tp, class _Dp>
|
||||
struct __pointer_type2
|
||||
{
|
||||
// Test that the bool template type parameter is emitted.
|
||||
//
|
||||
// CHECK: ![[PARAMS]] = metadata !{metadata !{{.*}}, metadata !{{.*}}, metadata ![[FALSE:[0-9]+]]}
|
||||
// CHECK: ![[FALSE]] = {{.*}} i8 0, {{.*}}} ; [ DW_TAG_template_value_parameter ]
|
||||
typedef typename __pointer_type_imp::__pointer_type1<_Tp, _Dp, false>::type type;
|
||||
};
|
||||
template <class _Tp> struct default_delete {};
|
||||
template <class _Tp, class _Dp = default_delete<_Tp> > class unique_ptr
|
||||
{
|
||||
typedef typename __pointer_type2<_Tp, _Dp>::type pointer;
|
||||
unique_ptr(pointer __p, _Dp __d) {}
|
||||
};
|
||||
class C {
|
||||
unique_ptr<C> Ptr;
|
||||
};
|
||||
void foo(C &c) {
|
||||
}
|
Loading…
Reference in New Issue