Author: arphaman Date: Thu Oct 6 04:37:15 2016 New Revision: 283428 URL: http://llvm.org/viewvc/llvm-project?rev=283428&view=rev Log: Fix PR30440: Initialize FunctionTypeDepth in CXXNameMangler
This commit fixes PR 30440 by initializing CXXNameMangler's FunctionTypeDepth in the two constructors added in r274222 (The commit that caused this regression). rdar://28455269 Differential Revision: https://reviews.llvm.org/D24932 Modified: cfe/trunk/lib/AST/ItaniumMangle.cpp cfe/trunk/test/CodeGenCXX/mangle-abi-tag.cpp Modified: cfe/trunk/lib/AST/ItaniumMangle.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ItaniumMangle.cpp?rev=283428&r1=283427&r2=283428&view=diff ============================================================================== --- cfe/trunk/lib/AST/ItaniumMangle.cpp (original) +++ cfe/trunk/lib/AST/ItaniumMangle.cpp Thu Oct 6 04:37:15 2016 @@ -405,14 +405,14 @@ public: CXXNameMangler(CXXNameMangler &Outer, raw_ostream &Out_) : Context(Outer.Context), Out(Out_), NullOut(false), Structor(Outer.Structor), StructorType(Outer.StructorType), - SeqID(Outer.SeqID), AbiTagsRoot(AbiTags), - Substitutions(Outer.Substitutions) {} + SeqID(Outer.SeqID), FunctionTypeDepth(Outer.FunctionTypeDepth), + AbiTagsRoot(AbiTags), Substitutions(Outer.Substitutions) {} CXXNameMangler(CXXNameMangler &Outer, llvm::raw_null_ostream &Out_) : Context(Outer.Context), Out(Out_), NullOut(true), Structor(Outer.Structor), StructorType(Outer.StructorType), - SeqID(Outer.SeqID), AbiTagsRoot(AbiTags), - Substitutions(Outer.Substitutions) {} + SeqID(Outer.SeqID), FunctionTypeDepth(Outer.FunctionTypeDepth), + AbiTagsRoot(AbiTags), Substitutions(Outer.Substitutions) {} #if MANGLE_CHECKER ~CXXNameMangler() { Modified: cfe/trunk/test/CodeGenCXX/mangle-abi-tag.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-abi-tag.cpp?rev=283428&r1=283427&r2=283428&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/mangle-abi-tag.cpp (original) +++ cfe/trunk/test/CodeGenCXX/mangle-abi-tag.cpp Thu Oct 6 04:37:15 2016 @@ -219,3 +219,16 @@ void f19_test(N19::C<N19::A, &N19::foo> } // f19_test(N19::C<N19::A, &N19::foo[abi:B]>, N19::F, N19::D) // CHECK-DAG: define void @_Z8f19_testN3N191CINS_1AEXadL_ZNS_3fooB1BES1_NS_1DEEEEENS_1FES2_( + +namespace pr30440 { + +template<class F> void g(F); +template<class ...A> auto h(A ...a)->decltype (g (0, g < a > (a) ...)) { +} +// CHECK-DAG: define {{.*}} @_ZN7pr304401hIJEEEDTcl1gLi0Espcl1gIL_ZZNS_1hEDpT_E1aEEfp_EEES2_( + +void pr30440_test () { + h(); +} + +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits