From ea3d3333d5826f37c5dbbc161ca7649e718cd88c Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Dec 07 2016 14:00:55 +0000 Subject: Update to 6.08.02 - Drop patches accepted upstream - Drop previously backported patches - Drop obsolete patches - Enable hadoop/hdfs support for all architectures * libhdfs is now available for more architectures than ix86 and x86_64 - Enable building on aarch64 - Rename the python packages to python2-root and python3-root - New sub-packages: python{2,3}-jupyroot, python{2,3}-jsmva - Dropped sub-package: root-rootaas (replaced by python{2,3}-jupyroot) --- diff --git a/root-32bit.patch b/root-32bit.patch index 326a8d8..ecd62a4 100644 --- a/root-32bit.patch +++ b/root-32bit.patch @@ -1,7 +1,8 @@ -diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math/mathmore/test/testSpecFunc.cxx ---- root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/math/mathmore/test/testSpecFunc.cxx 2016-04-09 20:03:06.376713840 +0200 -@@ -179,7 +179,7 @@ +diff --git a/math/mathmore/test/testSpecFunc.cxx b/math/mathmore/test/testSpecFunc.cxx +index d768160..8c223ee 100644 +--- a/math/mathmore/test/testSpecFunc.cxx ++++ b/math/mathmore/test/testSpecFunc.cxx +@@ -186,7 +186,7 @@ int testSpecFunc() { iret |= compare("hyperg(8, -8, 1, 0.5) ", hyperg(8, -8, 1, 0.5), 0.13671875); @@ -10,10 +11,16 @@ diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345); -diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathCore.cxx ---- root-6.06.02.orig/test/stressMathCore.cxx 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/test/stressMathCore.cxx 2016-04-09 20:03:06.395714018 +0200 -@@ -1121,7 +1121,7 @@ +diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx +index 1006dd1..5dc96ee 100644 +--- a/test/stressMathCore.cxx ++++ b/test/stressMathCore.cxx +@@ -1117,11 +1117,11 @@ int testVector(int ngen, bool testio=false) { + + s1 = a.testOperations(v1); a.print(VecType::name()+" operations"); + scale = Dim*20; +- if (Dim==3 && VecType::name() == "RhoEtaPhiVector") scale *= 10; // for problem with RhoEtaPhi ++ if (Dim==3 && VecType::name() == "RhoEtaPhiVector") scale *= 12; // for problem with RhoEtaPhi if (Dim==4 && VecType::name() == "PtEtaPhiMVector") scale *= 10; #if defined (R__LINUX) && !defined(R__B64) // problem of precision on linux 32 @@ -22,57 +29,3 @@ diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathC #endif // for problem with PtEtaPhiE if (Dim==4 && VecType::name() == "PtEtaPhiEVector") scale = 0.01/(std::numeric_limits::epsilon()); -diff -ur root-6.06.02.orig/test/TFormulaParsingTests.h root-6.06.02/test/TFormulaParsingTests.h ---- root-6.06.02.orig/test/TFormulaParsingTests.h 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/test/TFormulaParsingTests.h 2016-04-09 20:03:06.395714018 +0200 -@@ -312,7 +312,7 @@ - ok &= (f1->Eval(1.5,2.5) == f0->Eval(1.5,2.5) ); - double par[2] = {3,4}; - double xx[2] = {0.8,1.6}; -- ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) ); -+ ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16); - return ok; - } - -@@ -326,7 +326,7 @@ - ok &= (f1->Eval(1.5,2.5,3.5) == f0->Eval(1.5,2.5,3.5) ); - double par[2] = {3,4}; - double xx[3] = {0.8,1.6,2.2}; -- ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) ); -+ ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16); - return ok; - } - -@@ -369,12 +369,12 @@ - TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 ); - f2.SetParameters(10,1,0,1); - f0.SetParameters(f2.GetParameters() ); -- ok &= (f2.Eval(1) == f0.Eval(1) ); -+ ok &= TMath::AreEqualAbs(f2.Eval(1), f0.Eval(1), 7e-16); - - TF1 f3("f3","f1+[0]"); - // param order should be the same - f3.SetParameters( f2.GetParameters() ); -- ok &= (f2.Eval(1) == f0.Eval(1) ); -+ ok &= TMath::AreEqualAbs(f3.Eval(1), f0.Eval(1), 7e-16); - return ok; - } - -@@ -465,7 +465,7 @@ - auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); }; - TF1 f6("f6",func,-10,10,4); - f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters()); -- ok &= (f5.Eval(2) == f6.Eval(2) ); -+ ok &= TMath::AreEqualAbs(f5.Eval(2), f6.Eval(2), 4.e-16); - return ok; - } - -@@ -485,7 +485,7 @@ - // keep same order in evaluation - TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2); - f0.SetParameters(1.1,2.1); -- ok &= (fsincos.Eval(2) == f0.Eval(2) ); -+ ok &= TMath::AreEqualAbs(fsincos.Eval(2), f0.Eval(2), 3e-16); - return ok; - - } diff --git a/root-abitags.patch b/root-abitags.patch deleted file mode 100644 index 040474a..0000000 --- a/root-abitags.patch +++ /dev/null @@ -1,1267 +0,0 @@ -diff -Nur root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst ---- root-6.06.02.orig/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst 1970-01-01 01:00:00.000000000 +0100 -+++ root-6.06.02/interpreter/llvm/src/docs/ItaniumMangleAbiTags.rst 2016-03-20 14:30:16.912570532 +0100 -@@ -0,0 +1,90 @@ -+======== -+Abi Tags -+======== -+ -+Introduction -+============ -+ -+This text tries to describe gcc semantic for mangling "abi_tag" attributes -+described in https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html -+ -+There is no guarantee the following rules are correct, complete or make sense -+in any way as they were determined empirically by experiments with gcc5. -+ -+Declaration -+=========== -+ -+Abi tags are declared in an abi_tag attribute and can be applied to a -+function, variable, class or inline namespace declaration. The attribute takes -+one or more strings (called tags); the order does not matter. -+ -+See https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html for -+details. -+ -+Tags on an inline namespace are called "implicit tags", all other tags are -+"explicit tags". -+ -+Mangling -+======== -+ -+All tags that are "active" on a are emitted after the -+, before or , and are part of -+the same the is. -+ -+They are mangled as: -+ -+ ::= * # sort by name -+ ::= B -+ -+Example: -+ -+ __attribute__((abi_tag("test"))) -+ void Func(); -+ -+ gets mangled as: _Z4FuncB4testv (prettified as `Func[abi:test]()`) -+ -+Active tags -+=========== -+ -+A namespace has never any active tags; for types (class / struct / union / -+enum) the explicit tags are the active tags. -+ -+For variables and functions the active tags are the explicit tags plus any -+"required tags" which are not in the "available tags" set: -+ -+ derived-tags := (required-tags - available-tags) -+ active-tags := explicit-tags + derived-tags -+ -+Required tags for a function -+============================ -+ -+If a function is used as a local scope for another name, and is part of -+another function as local scope, it doesn't have any required tags. -+ -+If a function is used as a local scope for a guard variable name, it doesn't -+have any required tags. -+ -+Otherwise the function requires any implicit or explicit tag used in the name -+for the return type. -+ -+Required tags for a variable -+============================ -+ -+A variable requires any implicit or explicit tag used in its type. -+ -+Available tags -+============== -+ -+All tags used in the prefix and in the template arguments for a name are -+available; for functions also all tags from the (which -+might include the return type for template functions) are available. -+ -+For s all active tags used in the local part () are available, but not implicit tags which were not active! -+ -+Implicit and explicit tags used in the for a function (as -+in the type of a cast operator) are NOT available. -+ -+Example: a cast operator to std::string (which is -+std::__cxx11::basic_string<...>) will use 'cxx11' as active tag, as it is -+required from the return type `std::string` but not available. -diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td ---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/Attr.td 2016-03-20 14:30:16.913570542 +0100 -@@ -144,6 +144,7 @@ - class UnsignedArgument : Argument; - class VariadicUnsignedArgument : Argument; - class VariadicExprArgument : Argument; -+class VariadicStringArgument : Argument; - - // A version of the form major.minor[.subminor]. - class VersionArgument : Argument; -@@ -336,6 +337,14 @@ - // Attributes begin here - // - -+def AbiTag : Attr { -+ let Spellings = [GCC<"abi_tag">]; -+ let Args = [VariadicStringArgument<"Tags">]; -+ let Subjects = SubjectList<[Struct, Var, Function, Namespace], ErrorDiag, -+ "ExpectedStructClassVariableFunctionMethodOrInlineNamespace">; -+ let Documentation = [Undocumented]; -+} -+ - def AddressSpace : TypeAttr { - let Spellings = [GNU<"address_space">]; - let Args = [IntArgument<"AddressSpace">]; -diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td ---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td 2016-03-20 14:30:16.928570683 +0100 -@@ -2255,7 +2255,8 @@ - "Objective-C instance methods|init methods of interface or class extension declarations|" - "variables, functions and classes|Objective-C protocols|" - "functions and global variables|structs, unions, and typedefs|structs and typedefs|" -- "interface or protocol declarations|kernel functions}1">, -+ "interface or protocol declarations|kernel functions|" -+ "structs, classes, variables, functions, methods and inline namespaces}1">, - InGroup; - def err_attribute_wrong_decl_type : Error; - def warn_type_attribute_wrong_type : Warning< -@@ -3922,6 +3923,12 @@ - def err_redefinition_extern_inline : Error< - "redefinition of a 'extern inline' function %0 is not supported in " - "%select{C99 mode|C++}1">; -+def err_attr_abi_tag_only_on_inline_namespace : -+ Error<"abi_tag attribute only allowed on inline namespaces">; -+def err_abi_tag_on_redeclaration : -+ Error<"cannot add abi_tag attribute in redeclaration">; -+def err_new_abi_tag_on_redeclaration : -+ Error<"abi_tag %0 missing in original declaration">; - - def note_deleted_dtor_no_operator_delete : Note< - "virtual destructor requires an unambiguous, accessible 'operator delete'">; -diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h ---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/interpreter/llvm/src/tools/clang/include/clang/Sema/AttributeList.h 2016-03-20 14:30:16.928570683 +0100 -@@ -846,7 +846,8 @@ - ExpectedStructOrUnionOrTypedef, - ExpectedStructOrTypedef, - ExpectedObjectiveCInterfaceOrProtocol, -- ExpectedKernelFunction -+ ExpectedKernelFunction, -+ ExpectedStructClassVariableFunctionMethodOrInlineNamespace - }; - - } // end namespace clang -diff -Nur root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp ---- root-6.06.02.orig/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/interpreter/llvm/src/tools/clang/lib/AST/ItaniumMangle.cpp 2016-03-20 14:30:16.930570702 +0100 -@@ -202,6 +202,8 @@ - class CXXNameMangler { - ItaniumMangleContextImpl &Context; - raw_ostream &Out; -+ bool NullOut = false; -+ bool DisableDerivedAbiTags = false; - - /// The "structor" is the top-level declaration being mangled, if - /// that's not a template specialization; otherwise it's the pattern -@@ -251,6 +253,167 @@ - - } FunctionTypeDepth; - -+ // abi_tag is a gcc attribute, taking one or more strings called "tags". -+ // -+ // the goal is to annotage against which version of a library an object was -+ // build and to be able to provide backwards compatibility ("dual abi"). -+ // -+ // for this the emitted mangled names have to be different, while you don't -+ // want the user to have to use different names in the source. -+ // -+ // the abi_tag can be present on Struct, Var and Function declarations as -+ // "explicit" tag, and on inline Namespace as "implicit" tag. Explicit tags -+ // are always emitted after the unqualified name, and (implicit) tags on -+ // namespace are not. -+ // -+ // For functions and variables there is a set of "implicitly available" -+ // tags. These tags are: all tags from the namespace/structs the name is -+ // embedded in, all tags from any template arguments of the name, and, for -+ // functions, alls tags used anywhere in the (i.e. -+ // parameters and sometimes the return type). -+ // -+ // For functions this is basically the list of all tags from the signature -+ // without the unqualified name and usually without the return type of the -+ // function. In `operator Type()` Type is NOT part of that list, as it is -+ // part of the unqualified name! -+ // -+ // Now all tags from the function return type/variable type which are not -+ // "implicitly available" must be added to the explicit list of tags, and -+ // are emitted after the unqualified name. -+ // -+ // Example: -+ // namespace std { -+ // inline namespace __cxx11 __attribute__((__abi_tag__("cxx11"))) { } -+ // inline namespace __cxx11 { -+ // struct string { }; -+ // } -+ // } -+ // -+ // std::string foo(); // needs abi tag "cxx11" on foo -+ // std::string foo(std::string); // does NOT need abi tag "cxx11" on foo -+ // __attribute__((__abi_tag__("cxx11"))) -+ // std::string foo2(std::string); // emit abi tag "cxx11" on foo anyway -+ // -+ // The tags are sorted by name before emitting, and are serialized as -+ // ::= B <"tag" source-name> -+ -+ typedef SmallVector AbiTagList; -+ -+ // state to gather all implicit and explicit tags used in a mangled name. -+ // must always have an instance of this while emitting any name to keep -+ // track. -+ // -+ // TODO(abitags): how to handle substituted names? they should add the tags used in -+ // the substitution to the list of available tags. -+ class AbiTagState final { -+ public: -+ //! all abi tags used implicitly or explicitly -+ std::set UsedAbiTags; -+ //! all explicit abi tags (i.e. not from namespace) -+ std::set EmittedAbiTags; -+ -+ AbiTagState* &LinkHead; -+ AbiTagState *Parent{nullptr}; -+ -+ bool LinkActive{false}; -+ -+ explicit AbiTagState(AbiTagState* &linkHead) -+ : LinkHead(linkHead) { -+ Parent = LinkHead; -+ LinkHead = this; -+ LinkActive = true; -+ } -+ -+ // no copy, no move -+ AbiTagState(AbiTagState const&) = delete; -+ AbiTagState& operator=(AbiTagState const&) = delete; -+ -+ ~AbiTagState() { -+ pop(); -+ } -+ -+ void pop() { -+ if (!LinkActive) return; -+ -+ assert(LinkHead == this && "abi tag link head must point to us on destruction"); -+ LinkActive = false; -+ if (Parent) { -+ Parent->UsedAbiTags.insert(UsedAbiTags.begin(), UsedAbiTags.end()); -+ Parent->EmittedAbiTags.insert(EmittedAbiTags.begin(), EmittedAbiTags.end()); -+ } -+ LinkHead = Parent; -+ } -+ -+ void write(raw_ostream &Out, const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) { -+ ND = cast(ND->getCanonicalDecl()); -+ -+ if (dyn_cast(ND) || dyn_cast(ND)) { -+ // assert(AdditionalAbiTags && "function and variables need a list of additional abi tags"); -+ } else { -+ assert(!AdditionalAbiTags && "only function and variables need a list of additional abi tags"); -+ if (const auto* NS = dyn_cast(ND)) { -+ if (const auto* AbiTag = NS->getAttr()) { -+ for (const auto& Tag: AbiTag->tags()) { -+ UsedAbiTags.insert(Tag); -+ } -+ } -+ // don't emit abi tags for namespaces -+ return; -+ } -+ } -+ -+ AbiTagList TagList; -+ if (const auto* AbiTag = ND->getAttr()) { -+ for (const auto& Tag: AbiTag->tags()) { -+ UsedAbiTags.insert(Tag); -+ // AbiTag->tags() is sorted and has no duplicates -+ TagList.push_back(Tag); -+ } -+ } -+ -+ if (AdditionalAbiTags) { -+ for (const auto& Tag: *AdditionalAbiTags) { -+ UsedAbiTags.insert(Tag); -+ if (std::find(TagList.begin(), TagList.end(), Tag) == TagList.end()) { -+ // don't insert duplicates -+ TagList.push_back(Tag); -+ } -+ } -+ // AbiTag->tags() are already sorted; only add if we had additional tags -+ std::sort(TagList.begin(), TagList.end()); -+ } -+ -+ writeSortedUniqueAbiTags(Out, TagList); -+ } -+ -+ protected: -+ template -+ void writeSortedUniqueAbiTags(raw_ostream &Out, TagList const& AbiTags) { -+ for (const auto& Tag: AbiTags) { -+ EmittedAbiTags.insert(Tag); -+ Out << "B"; -+ Out << Tag.size(); -+ Out << Tag; -+ } -+ } -+ } *AbiTags = nullptr; -+ AbiTagState AbiTagsRoot{AbiTags}; -+ -+ struct TemporaryDisableDerivedAbiTags { -+ bool& StateRef; -+ bool OldState; -+ -+ TemporaryDisableDerivedAbiTags(bool& State, bool Disable = true) -+ : StateRef(State) { -+ OldState = StateRef; -+ StateRef = Disable; -+ } -+ TemporaryDisableDerivedAbiTags(TemporaryDisableDerivedAbiTags const&) = delete; -+ ~TemporaryDisableDerivedAbiTags() { -+ StateRef = OldState; -+ } -+ }; -+ - llvm::DenseMap Substitutions; - - ASTContext &getASTContext() const { return Context.getASTContext(); } -@@ -273,6 +436,10 @@ - : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type), - SeqID(0) { } - -+ CXXNameMangler(CXXNameMangler &Outer, llvm::raw_null_ostream &Out_) -+ : Context(Outer.Context), Out(Out_), NullOut(true), Structor(Outer.Structor), StructorType(Outer.StructorType), -+ SeqID(Outer.SeqID) { } -+ - #if MANGLE_CHECKER - ~CXXNameMangler() { - if (Out.str()[0] == '\01') -@@ -286,18 +453,21 @@ - #endif - raw_ostream &getStream() { return Out; } - -+ void disableDerivedAbiTags() { DisableDerivedAbiTags = true; } -+ - void mangle(const NamedDecl *D, StringRef Prefix = "_Z"); - void mangleCallOffset(int64_t NonVirtual, int64_t Virtual); - void mangleNumber(const llvm::APSInt &I); - void mangleNumber(int64_t Number); - void mangleFloat(const llvm::APFloat &F); -- void mangleFunctionEncoding(const FunctionDecl *FD); -+ void mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName = false); - void mangleSeqID(unsigned SeqID); -- void mangleName(const NamedDecl *ND); -+ void mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName = false); - void mangleType(QualType T); - void mangleNameOrStandardSubstitution(const NamedDecl *ND); - - private: -+ void writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags = nullptr); - - bool mangleSubstitution(const NamedDecl *ND); - bool mangleSubstitution(QualType T); -@@ -326,31 +496,49 @@ - DeclarationName name, - unsigned KnownArity = UnknownArity); - -- void mangleName(const TemplateDecl *TD, -+ void mangleFunctionEncodingBareType(const FunctionDecl *FD); -+ -+ void mangleNameWithAbiTags(const NamedDecl *ND, -+ const AbiTagList *AdditionalAbiTags, -+ bool ExcludeUnqualifiedName); -+ void mangleTemplateName(const TemplateDecl *TD, -+ const AbiTagList *AdditionalAbiTags, -+ bool ExcludeUnqualifiedName, - const TemplateArgument *TemplateArgs, - unsigned NumTemplateArgs); -- void mangleUnqualifiedName(const NamedDecl *ND) { -- mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity); -+ void mangleUnqualifiedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) { -+ mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity, AdditionalAbiTags); - } - void mangleUnqualifiedName(const NamedDecl *ND, DeclarationName Name, -- unsigned KnownArity); -- void mangleUnscopedName(const NamedDecl *ND); -- void mangleUnscopedTemplateName(const TemplateDecl *ND); -- void mangleUnscopedTemplateName(TemplateName); -+ unsigned KnownArity, const AbiTagList *AdditionalAbiTags); -+ void mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags); -+ void mangleUnscopedTemplateName(const TemplateDecl *ND, -+ const AbiTagList *AdditionalAbiTags); -+ void mangleUnscopedTemplateName(TemplateName, -+ const AbiTagList *AdditionalAbiTags); - void mangleSourceName(const IdentifierInfo *II); -- void mangleLocalName(const Decl *D); -+ void mangleLocalName(const Decl *D, -+ const AbiTagList *AdditionalAbiTags, -+ bool ExcludeUnqualifiedName); - void mangleBlockForPrefix(const BlockDecl *Block); - void mangleUnqualifiedBlock(const BlockDecl *Block); - void mangleLambda(const CXXRecordDecl *Lambda); - void mangleNestedName(const NamedDecl *ND, const DeclContext *DC, -- bool NoFunction=false); -+ const AbiTagList *AdditionalAbiTags, -+ bool NoFunction, -+ bool ExcludeUnqualifiedName); - void mangleNestedName(const TemplateDecl *TD, -+ const AbiTagList *AdditionalAbiTags, -+ bool ExcludeUnqualifiedName, - const TemplateArgument *TemplateArgs, - unsigned NumTemplateArgs); - void manglePrefix(NestedNameSpecifier *qualifier); - void manglePrefix(const DeclContext *DC, bool NoFunction=false); - void manglePrefix(QualType type); -- void mangleTemplatePrefix(const TemplateDecl *ND, bool NoFunction=false); -+ void mangleTemplatePrefix(const TemplateDecl *ND, -+ const AbiTagList *AdditionalAbiTags, -+ bool NoFunction = false, -+ bool ExcludeUnqualifiedName = false); - void mangleTemplatePrefix(TemplateName Template); - void mangleOperatorName(OverloadedOperatorKind OO, unsigned Arity); - void mangleQualifiers(Qualifiers Quals); -@@ -391,6 +579,10 @@ - void mangleTemplateParameter(unsigned Index); - - void mangleFunctionParam(const ParmVarDecl *parm); -+ -+ std::set getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND); -+ AbiTagList makeAdditionalTagsForFunction(const FunctionDecl *FD); -+ AbiTagList makeAdditionalTagsForVariable(const VarDecl *VD); - }; - - } -@@ -441,6 +633,11 @@ - return true; - } - -+void CXXNameMangler::writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) { -+ assert(AbiTags && "require AbiTagState"); -+ if (AbiTags) AbiTags->write(Out, ND, DisableDerivedAbiTags ? nullptr : AdditionalAbiTags); -+} -+ - void CXXNameMangler::mangle(const NamedDecl *D, StringRef Prefix) { - // ::= _Z - // ::= -@@ -456,14 +653,28 @@ - mangleName(cast(D)); - } - --void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD) { -- // ::= -- mangleName(FD); -- -+void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName) { - // Don't mangle in the type if this isn't a decl we should typically mangle. -- if (!Context.shouldMangleDeclName(FD)) -+ if (!Context.shouldMangleDeclName(FD)) { -+ mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName); - return; -+ } -+ -+ // ::= -+ -+ if (ExcludeUnqualifiedName) -+ { -+ // running makeAdditionalTagsForFunction would loop, don't need it here anyway -+ mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName); -+ } else { -+ AbiTagList AdditionalAbiTags = makeAdditionalTagsForFunction(FD); -+ mangleNameWithAbiTags(FD, &AdditionalAbiTags, ExcludeUnqualifiedName); -+ } -+ -+ mangleFunctionEncodingBareType(FD); -+} - -+void CXXNameMangler::mangleFunctionEncodingBareType(const FunctionDecl *FD) { - if (FD->hasAttr()) { - FunctionTypeDepthState Saved = FunctionTypeDepth.push(); - Out << "Ua9enable_ifI"; -@@ -509,7 +720,7 @@ - FD = PrimaryTemplate->getTemplatedDecl(); - } - -- mangleBareFunctionType(FD->getType()->getAs(), -+ mangleBareFunctionType(FD->getType()->getAs(), - MangleReturnType); - } - -@@ -567,7 +778,21 @@ - return nullptr; - } - --void CXXNameMangler::mangleName(const NamedDecl *ND) { -+// must not be run from mangleLocalName for the as it would loop otherwise. -+void CXXNameMangler::mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName) { -+ if (!ExcludeUnqualifiedName) { -+ if (const VarDecl *VD = dyn_cast(ND)) { -+ AbiTagList VariableAdditionalAbiTags = makeAdditionalTagsForVariable(VD); -+ mangleNameWithAbiTags(VD, &VariableAdditionalAbiTags, ExcludeUnqualifiedName); -+ return; -+ } -+ } -+ mangleNameWithAbiTags(ND, nullptr, ExcludeUnqualifiedName); -+} -+ -+void CXXNameMangler::mangleNameWithAbiTags(const NamedDecl *ND, -+ const AbiTagList *AdditionalAbiTags, -+ bool ExcludeUnqualifiedName) { - // ::= - // ::= - // ::= -@@ -583,7 +808,7 @@ - while (!DC->isNamespace() && !DC->isTranslationUnit()) - DC = getEffectiveParentContext(DC); - else if (GetLocalClassDecl(ND)) { -- mangleLocalName(ND); -+ mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName); - return; - } - -@@ -593,76 +818,88 @@ - // Check if we have a template. - const TemplateArgumentList *TemplateArgs = nullptr; - if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) { -- mangleUnscopedTemplateName(TD); -+ if (!ExcludeUnqualifiedName) -+ mangleUnscopedTemplateName(TD, AdditionalAbiTags); - mangleTemplateArgs(*TemplateArgs); - return; - } - -- mangleUnscopedName(ND); -+ if (!ExcludeUnqualifiedName) -+ mangleUnscopedName(ND, AdditionalAbiTags); - return; - } - - if (isLocalContainerContext(DC)) { -- mangleLocalName(ND); -+ mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName); - return; - } - -- mangleNestedName(ND, DC); -+ mangleNestedName(ND, DC, AdditionalAbiTags, /* NoFunction */ false, ExcludeUnqualifiedName); - } --void CXXNameMangler::mangleName(const TemplateDecl *TD, -- const TemplateArgument *TemplateArgs, -- unsigned NumTemplateArgs) { -+ -+void CXXNameMangler::mangleTemplateName(const TemplateDecl *TD, -+ const AbiTagList *AdditionalAbiTags, -+ bool ExcludeUnqualifiedName, -+ const TemplateArgument *TemplateArgs, -+ unsigned NumTemplateArgs) { - const DeclContext *DC = IgnoreLinkageSpecDecls(getEffectiveDeclContext(TD)); - - if (DC->isTranslationUnit() || isStdNamespace(DC)) { -- mangleUnscopedTemplateName(TD); -+ if (!ExcludeUnqualifiedName) -+ mangleUnscopedTemplateName(TD, AdditionalAbiTags); - mangleTemplateArgs(TemplateArgs, NumTemplateArgs); - } else { -- mangleNestedName(TD, TemplateArgs, NumTemplateArgs); -+ mangleNestedName(TD, AdditionalAbiTags, ExcludeUnqualifiedName, TemplateArgs, NumTemplateArgs); - } - } - --void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND) { -+void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) { - // ::= - // ::= St # ::std:: - - if (isStdNamespace(IgnoreLinkageSpecDecls(getEffectiveDeclContext(ND)))) - Out << "St"; - -- mangleUnqualifiedName(ND); -+ mangleUnqualifiedName(ND, AdditionalAbiTags); - } - --void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND) { -+void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND, -+ const AbiTagList *AdditionalAbiTags) { - // ::= - // ::= - if (mangleSubstitution(ND)) - return; - - // ::= -- if (const auto *TTP = dyn_cast(ND)) -+ if (const auto *TTP = dyn_cast(ND)) { -+ assert(!AdditionalAbiTags && "template template param cannot have abi tags"); // TODO(abitags) - mangleTemplateParameter(TTP->getIndex()); -- else -- mangleUnscopedName(ND->getTemplatedDecl()); -+ } else { -+ mangleUnscopedName(ND->getTemplatedDecl(), AdditionalAbiTags); -+ } - - addSubstitution(ND); - } - --void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template) { -+void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template, -+ const AbiTagList *AdditionalAbiTags) { - // ::= - // ::= - if (TemplateDecl *TD = Template.getAsTemplateDecl()) -- return mangleUnscopedTemplateName(TD); -+ return mangleUnscopedTemplateName(TD, AdditionalAbiTags); - - if (mangleSubstitution(Template)) - return; - -+ assert(!AdditionalAbiTags && "dependent template name cannot have abi tags"); // TODO(abitags) -+ - DependentTemplateName *Dependent = Template.getAsDependentTemplateName(); - assert(Dependent && "Not a dependent template name?"); - if (const IdentifierInfo *Id = Dependent->getIdentifier()) - mangleSourceName(Id); - else - mangleOperatorName(Dependent->getOperator(), UnknownArity); -- -+ - addSubstitution(Template); - } - -@@ -824,6 +1061,7 @@ - else - Out << "sr"; - mangleSourceName(qualifier->getAsNamespace()->getIdentifier()); -+ writeAbiTags(qualifier->getAsNamespace()); - break; - case NestedNameSpecifier::NamespaceAlias: - if (qualifier->getPrefix()) -@@ -832,6 +1070,7 @@ - else - Out << "sr"; - mangleSourceName(qualifier->getAsNamespaceAlias()->getIdentifier()); -+ writeAbiTags(qualifier->getAsNamespaceAlias()); - break; - - case NestedNameSpecifier::TypeSpec: -@@ -917,15 +1156,18 @@ - - case Type::Typedef: - mangleSourceName(cast(type)->getDecl()->getIdentifier()); -+ writeAbiTags(cast(type)->getDecl()); - break; - - case Type::UnresolvedUsing: - mangleSourceName(cast(type)->getDecl() - ->getIdentifier()); -+ writeAbiTags(cast(type)->getDecl()); - break; - - case Type::Record: - mangleSourceName(cast(type)->getDecl()->getIdentifier()); -+ writeAbiTags(cast(type)->getDecl()); - break; - - case Type::TemplateSpecialization: { -@@ -943,6 +1185,7 @@ - if (isa(temp)) goto unresolvedType; - - mangleSourceName(temp->getIdentifier()); -+ writeAbiTags(temp); - break; - } - -@@ -974,16 +1217,19 @@ - case Type::InjectedClassName: - mangleSourceName(cast(type)->getDecl() - ->getIdentifier()); -+ writeAbiTags(cast(type)->getDecl()); - break; - - case Type::DependentName: - mangleSourceName(cast(type)->getIdentifier()); -+ // writeAbiTags(cast(type)); - break; - - case Type::DependentTemplateSpecialization: { - const DependentTemplateSpecializationType *tst - = cast(type); - mangleSourceName(tst->getIdentifier()); -+ // writeAbiTags(tst); - mangleTemplateArgs(tst->getArgs(), tst->getNumArgs()); - break; - } -@@ -1033,6 +1279,7 @@ - } - - mangleSourceName(qualifier->getAsIdentifier()); -+ writeAbiTags(qualifier->getAsNamespaceAlias()); - break; - } - -@@ -1049,12 +1296,14 @@ - DeclarationName name, - unsigned knownArity) { - if (qualifier) mangleUnresolvedPrefix(qualifier, firstQualifierLookup); -- mangleUnqualifiedName(nullptr, name, knownArity); -+ mangleUnqualifiedName(nullptr, name, knownArity, -+ /*AdditionalAbiTags*/ nullptr); - } - - void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND, - DeclarationName Name, -- unsigned KnownArity) { -+ unsigned KnownArity, -+ const AbiTagList *AdditionalAbiTags) { - // ::= - // ::= - // ::= -@@ -1072,6 +1321,8 @@ - Out << 'L'; - - mangleSourceName(II); -+ if (ND) -+ writeAbiTags(ND, AdditionalAbiTags); - break; - } - -@@ -1111,6 +1362,7 @@ - assert(FD->getIdentifier() && "Data member name isn't an identifier!"); - - mangleSourceName(FD->getIdentifier()); -+ // TODO(abitags): not emitting abi tags: internal name anyway - break; - } - -@@ -1131,6 +1383,9 @@ - assert(D->getDeclName().getAsIdentifierInfo() && - "Typedef was not named!"); - mangleSourceName(D->getDeclName().getAsIdentifierInfo()); -+ assert(!AdditionalAbiTags && "Type cannot have additional abi tags"); -+ // explicit abi tags are still possible; take from underlying type, not from typedef. -+ writeAbiTags(TD, nullptr); - break; - } - -@@ -1140,6 +1395,7 @@ - // ::= + # Parameter types or 'v' for 'void'. - if (const CXXRecordDecl *Record = dyn_cast(TD)) { - if (Record->isLambda() && Record->getLambdaManglingNumber()) { -+ assert(!AdditionalAbiTags && "Lambda type cannot have additional abi tags"); - mangleLambda(Record); - break; - } -@@ -1151,6 +1407,7 @@ - if (UnnamedMangle > 1) - Out << llvm::utostr(UnnamedMangle - 2); - Out << '_'; -+ writeAbiTags(TD, AdditionalAbiTags); - break; - } - -@@ -1183,6 +1440,7 @@ - // Otherwise, use the complete constructor name. This is relevant if a - // class with a constructor is declared within a constructor. - mangleCXXCtorType(Ctor_Complete); -+ writeAbiTags(ND, AdditionalAbiTags); - break; - - case DeclarationName::CXXDestructorName: -@@ -1194,12 +1452,14 @@ - // Otherwise, use the complete destructor name. This is relevant if a - // class with a destructor is declared within a destructor. - mangleCXXDtorType(Dtor_Complete); -+ writeAbiTags(ND, AdditionalAbiTags); - break; - - case DeclarationName::CXXConversionFunctionName: - // ::= cv # (cast) - Out << "cv"; - mangleType(Name.getCXXNameType()); -+ writeAbiTags(ND, AdditionalAbiTags); - break; - - case DeclarationName::CXXOperatorName: { -@@ -1223,6 +1483,7 @@ - // FIXME: This mangling is not yet official. - Out << "li"; - mangleSourceName(Name.getCXXLiteralIdentifier()); -+ writeAbiTags(ND, AdditionalAbiTags); - break; - - case DeclarationName::CXXUsingDirective: -@@ -1239,7 +1500,9 @@ - - void CXXNameMangler::mangleNestedName(const NamedDecl *ND, - const DeclContext *DC, -- bool NoFunction) { -+ const AbiTagList *AdditionalAbiTags, -+ bool NoFunction, -+ bool ExcludeUnqualifiedName) { - // - // ::= N [] [] E - // ::= N [] [] -@@ -1259,30 +1522,35 @@ - // Check if we have a template. - const TemplateArgumentList *TemplateArgs = nullptr; - if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) { -- mangleTemplatePrefix(TD, NoFunction); -+ mangleTemplatePrefix(TD, AdditionalAbiTags, NoFunction, ExcludeUnqualifiedName); - mangleTemplateArgs(*TemplateArgs); - } - else { - manglePrefix(DC, NoFunction); -- mangleUnqualifiedName(ND); -+ if (!ExcludeUnqualifiedName) -+ mangleUnqualifiedName(ND, AdditionalAbiTags); - } - - Out << 'E'; - } - void CXXNameMangler::mangleNestedName(const TemplateDecl *TD, -+ const AbiTagList *AdditionalAbiTags, -+ bool ExcludeUnqualifiedName, - const TemplateArgument *TemplateArgs, - unsigned NumTemplateArgs) { - // ::= N [] E - - Out << 'N'; - -- mangleTemplatePrefix(TD); -+ mangleTemplatePrefix(TD, AdditionalAbiTags, ExcludeUnqualifiedName); - mangleTemplateArgs(TemplateArgs, NumTemplateArgs); - - Out << 'E'; - } - --void CXXNameMangler::mangleLocalName(const Decl *D) { -+void CXXNameMangler::mangleLocalName(const Decl *D, -+ const AbiTagList *AdditionalAbiTags, -+ bool ExcludeUnqualifiedName) { - // := Z E [] - // := Z E s [] - // := Z E d [ ] -@@ -1294,15 +1562,25 @@ - - Out << 'Z'; - -- if (const ObjCMethodDecl *MD = dyn_cast(DC)) -- mangleObjCMethodName(MD); -- else if (const BlockDecl *BD = dyn_cast(DC)) -- mangleBlockForPrefix(BD); -- else -- mangleFunctionEncoding(cast(DC)); -+ { -+ AbiTagState localAbiTags(AbiTags); -+ -+ if (const ObjCMethodDecl *MD = dyn_cast(DC)) -+ mangleObjCMethodName(MD); -+ else if (const BlockDecl *BD = dyn_cast(DC)) -+ mangleBlockForPrefix(BD); -+ else -+ mangleFunctionEncoding(cast(DC)); -+ -+ // implicit abi tags (from namespace) are not available in the following -+ // entity; reset to actually emitted tags, which are available. -+ localAbiTags.UsedAbiTags = localAbiTags.EmittedAbiTags; -+ } - - Out << 'E'; - -+ TemporaryDisableDerivedAbiTags TemporyDisable(DisableDerivedAbiTags, getStructor(dyn_cast(D)) != Structor); -+ - if (RD) { - // The parameter number is omitted for the last parameter, 0 for the - // second-to-last parameter, 1 for the third-to-last parameter, etc. The -@@ -1327,13 +1605,17 @@ - // Mangle the name relative to the closest enclosing function. - // equality ok because RD derived from ND above - if (D == RD) { -- mangleUnqualifiedName(RD); -+ if (!ExcludeUnqualifiedName) -+ mangleUnqualifiedName(RD, AdditionalAbiTags); - } else if (const BlockDecl *BD = dyn_cast(D)) { - manglePrefix(getEffectiveDeclContext(BD), true /*NoFunction*/); -- mangleUnqualifiedBlock(BD); -+ assert(!AdditionalAbiTags && "Block cannot have additional abi tags"); -+ if (!ExcludeUnqualifiedName) -+ mangleUnqualifiedBlock(BD); - } else { - const NamedDecl *ND = cast(D); -- mangleNestedName(ND, getEffectiveDeclContext(ND), true /*NoFunction*/); -+ mangleNestedName(ND, getEffectiveDeclContext(ND), -+ AdditionalAbiTags, true /*NoFunction*/, ExcludeUnqualifiedName); - } - } else if (const BlockDecl *BD = dyn_cast(D)) { - // Mangle a block in a default parameter; see above explanation for -@@ -1350,30 +1632,35 @@ - } - } - -- mangleUnqualifiedBlock(BD); -+ assert(!AdditionalAbiTags && "Block cannot have additional abi tags"); -+ if (!ExcludeUnqualifiedName) -+ mangleUnqualifiedBlock(BD); - } else { -- mangleUnqualifiedName(cast(D)); -+ if (!ExcludeUnqualifiedName) -+ mangleUnqualifiedName(cast(D), AdditionalAbiTags); - } - -- if (const NamedDecl *ND = dyn_cast(RD ? RD : D)) { -- unsigned disc; -- if (Context.getNextDiscriminator(ND, disc)) { -- if (disc < 10) -- Out << '_' << disc; -- else -- Out << "__" << disc << '_'; -+ if (!ExcludeUnqualifiedName) { -+ if (const NamedDecl *ND = dyn_cast(RD ? RD : D)) { -+ unsigned disc; -+ if (Context.getNextDiscriminator(ND, disc)) { -+ if (disc < 10) -+ Out << '_' << disc; -+ else -+ Out << "__" << disc << '_'; -+ } - } - } - } - - void CXXNameMangler::mangleBlockForPrefix(const BlockDecl *Block) { - if (GetLocalClassDecl(Block)) { -- mangleLocalName(Block); -+ mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false); - return; - } - const DeclContext *DC = getEffectiveDeclContext(Block); - if (isLocalContainerContext(DC)) { -- mangleLocalName(Block); -+ mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false); - return; - } - manglePrefix(getEffectiveDeclContext(Block)); -@@ -1384,10 +1671,11 @@ - if (Decl *Context = Block->getBlockManglingContextDecl()) { - if ((isa(Context) || isa(Context)) && - Context->getDeclContext()->isRecord()) { -- if (const IdentifierInfo *Name -- = cast(Context)->getIdentifier()) { -+ const auto *ND = cast(Context); -+ if (const IdentifierInfo *Name = ND->getIdentifier()) { - mangleSourceName(Name); -- Out << 'M'; -+ writeAbiTags(ND, /* AdditionalAbiTags */ nullptr); -+ Out << 'M'; - } - } - } -@@ -1420,7 +1708,7 @@ - if (const IdentifierInfo *Name - = cast(Context)->getIdentifier()) { - mangleSourceName(Name); -- Out << 'M'; -+ Out << 'M'; - } - } - } -@@ -1502,11 +1790,11 @@ - // Check if we have a template. - const TemplateArgumentList *TemplateArgs = nullptr; - if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) { -- mangleTemplatePrefix(TD); -+ mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr); - mangleTemplateArgs(*TemplateArgs); - } else { - manglePrefix(getEffectiveDeclContext(ND), NoFunction); -- mangleUnqualifiedName(ND); -+ mangleUnqualifiedName(ND, /* AdditionalAbiTags */ nullptr); - } - - addSubstitution(ND); -@@ -1517,7 +1805,7 @@ - // ::= - // ::= - if (TemplateDecl *TD = Template.getAsTemplateDecl()) -- return mangleTemplatePrefix(TD); -+ return mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr); - - if (QualifiedTemplateName *Qualified = Template.getAsQualifiedTemplateName()) - manglePrefix(Qualified->getQualifier()); -@@ -1525,18 +1813,21 @@ - if (OverloadedTemplateStorage *Overloaded - = Template.getAsOverloadedTemplate()) { - mangleUnqualifiedName(nullptr, (*Overloaded->begin())->getDeclName(), -- UnknownArity); -+ UnknownArity, -+ /* AdditionalAbiTags */ nullptr); - return; - } - - DependentTemplateName *Dependent = Template.getAsDependentTemplateName(); - assert(Dependent && "Unknown template name kind?"); - manglePrefix(Dependent->getQualifier()); -- mangleUnscopedTemplateName(Template); -+ mangleUnscopedTemplateName(Template, /* AdditionalAbiTags */ nullptr); - } - - void CXXNameMangler::mangleTemplatePrefix(const TemplateDecl *ND, -- bool NoFunction) { -+ const AbiTagList *AdditionalAbiTags, -+ bool NoFunction, -+ bool ExcludeUnqualifiedName) { - // ::=