From 9b14190aa440c3f99de32b86ad31fc5c103052d1 Mon Sep 17 00:00:00 2001 From: Evgenii Shatokhin Date: Sun, 11 Sep 2016 17:18:35 +0300 Subject: [PATCH] Updated to version 3.9.0 Most of the work was done in https://abf.io/import/llvm/pull_requests/2 I have reworked clang-mandriva.patch to keeps it (as clang-rosa.patch). It seems, it did not actually detect ROSA in the past (it checked that /etc/lsb-release has DISTRIB_ID=Mandriva<...> while we have "Rosa<...>" there). However, it could be useful to align the default Clang flags with Ubuntu, Fedora and such. --- .abf.yml | 10 +- 0000-clang-mandriva.patch | 216 --- ...ema-part-of-attrbute-abi_tag-support.patch | 314 ----- ...ler-part-of-attrbute-abi_tag-support.patch | 1237 ----------------- clang-gcc-compat.patch | 17 +- clang-rosa.patch | 95 ++ clang-soname.patch | 11 - llvm.spec | 46 +- ...-Fix-Always-honor-LLVM_LIBDIR_SUFFIX.patch | 33 - 9 files changed, 127 insertions(+), 1852 deletions(-) delete mode 100644 0000-clang-mandriva.patch delete mode 100644 D17567-PR23529-Sema-part-of-attrbute-abi_tag-support.patch delete mode 100644 D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.patch create mode 100644 clang-rosa.patch delete mode 100644 clang-soname.patch delete mode 100644 polly-Fix-Always-honor-LLVM_LIBDIR_SUFFIX.patch diff --git a/.abf.yml b/.abf.yml index 23a31fb..35056e9 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ sources: - cfe-3.8.0.src.tar.xz: 2230ef962f2df3c13ec93f5b04b0e3cdff94b2ce - clang-tools-extra-3.8.0.src.tar.xz: a99d8b6fc5e593c4671424b327779318a1856acf - compiler-rt-3.8.0.src.tar.xz: 480ea09e369dac6de1f3759b27fa19417b26b69e - llvm-3.8.0.src.tar.xz: 723ac918979255706434a05f5af34b71c49c9971 - polly-3.8.0.src.tar.xz: 8db242fbc4a33eacf08e11fad033b2a90c652ac9 + cfe-3.9.0.src.tar.xz: 00d49ee82451130a8e1e7b1d56cffa37b783bcb2 + clang-tools-extra-3.9.0.src.tar.xz: 396ad1af7a8d3cff015a644e595f35553a7548c4 + compiler-rt-3.9.0.src.tar.xz: a306d576e84b7ee048ebb0ae5ca72e6ec9e1c549 + llvm-3.9.0.src.tar.xz: da792f11a208d5b994c4fe1c8faa20f90ff0e4a3 + polly-3.9.0.src.tar.xz: 9d5809bd413b05de18480b69fcf6dbe8d3b1f9ac diff --git a/0000-clang-mandriva.patch b/0000-clang-mandriva.patch deleted file mode 100644 index c50e05e..0000000 --- a/0000-clang-mandriva.patch +++ /dev/null @@ -1,216 +0,0 @@ ---- clang/lib/Driver/ToolChains.cpp.mandriva~ 2016-01-13 00:47:59.000000000 +0100 -+++ clang/lib/Driver/ToolChains.cpp 2016-01-26 11:16:44.273579956 +0100 -@@ -1418,16 +1418,46 @@ bool Generic_GCC::GCCInstallationDetecto - static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; - static const char *const AArch64Triples[] = { - "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-linux-android", -- "aarch64-redhat-linux"}; -- static const char *const AArch64beLibDirs[] = {"/lib"}; -- static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu", -- "aarch64_be-linux-gnu"}; -+ "aarch64-redhat-linux", "aarch64-mandriva-linux-gnu", -+ "aarch64-openmandriva-linux-gnu", "aarch64-openmandriva-linux-musl"}; -+ static const char *const AArch64beLibDirs[] = {"/lib64", "/lib"}; -+ static const char *const AArch64beTriples[] = { -+ "aarch64_be-none-linux-gnu", "aarch64_be-linux-gnu", -+ "aarch64_be-linux-android", "aarch64_be-mandriva-linux-gnu", -+ "aarch64_be-openmandriva-linux-gnu", "aarch64_be-openmandriva-linux-musl" -+ }; - - static const char *const ARMLibDirs[] = {"/lib"}; - static const char *const ARMTriples[] = {"arm-linux-gnueabi", -- "arm-linux-androideabi"}; -- static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", -- "armv7hl-redhat-linux-gnueabi"}; -+ "arm-linux-androideabi", -+ "arm-mandriva-linux-gnueabi", -+ "arm-openmandriva-linux-gnueabi", -+ "arm-openmandriva-linux-musl", -+ "arm-openmandriva-linux-musleabi", -+ "armv6-mandriva-linux-gnueabi", -+ "armv6-openmandriva-linux-gnueabi", -+ "armv7-mandriva-linux-gnueabi", -+ "armv7-openmandriva-linux-gnueabi", -+ "armv7-openmandriva-linux-musleabi"}; -+ static const char *const ARMHFTriples[] = { -+ "arm-linux-gnueabihf", -+ "armv7hl-redhat-linux-gnueabi", -+ "arm-mandriva-linux-gnueabihf", -+ "arm-openmandriva-linux-gnueabihf", -+ "arm-openmandriva-linux-musleabihf", -+ "armv7hl-openmandriva-linux-gnueabi", -+ "armv7hl-openmandriva-linux-gnueabihf", -+ "armv7hnl-openmandriva-linux-gnueabi", -+ "armv7hnl-openmandriva-linux-musleabi", -+ "armv7nl-openmandriva-linux-gnueabihf", -+ "armv7nl-openmandriva-linux-musleabihf", -+ "armv6hl-openmandriva-linux-gnueabi", -+ "armv6hl-openmandriva-linux-gnueabihf", -+ "armv6hnl-openmandriva-linux-gnueabi", -+ "armv6hnl-openmandriva-linux-musleabi", -+ "armv6nl-openmandriva-linux-gnueabihf", -+ "armv6nl-openmandriva-linux-musleabihf" -+ }; - static const char *const ARMebLibDirs[] = {"/lib"}; - static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", - "armeb-linux-androideabi"}; -@@ -1441,7 +1471,9 @@ bool Generic_GCC::GCCInstallationDetecto - "x86_64-redhat-linux", "x86_64-suse-linux", - "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", - "x86_64-slackware-linux", "x86_64-linux-android", -- "x86_64-unknown-linux"}; -+ "x86_64-unknown-linux", "x86_64-mandriva-linux-gnu", -+ "x86_64-openmandriva-linux-gnu", -+ "x86_64-openmandriva-linux-musl"}; - static const char *const X32LibDirs[] = {"/libx32"}; - static const char *const X86LibDirs[] = {"/lib32", "/lib"}; - static const char *const X86Triples[] = { -@@ -1449,7 +1481,15 @@ bool Generic_GCC::GCCInstallationDetecto - "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux", - "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux", - "i486-slackware-linux", "i686-montavista-linux", "i686-linux-android", -- "i586-linux-gnu"}; -+ "i586-linux-gnu", "i586-mandriva-linux", "i586-mandriva-linux-gnu", -+ "i686-mandriva-linux", "i686-mandriva-linux-gnu", -+ "i586-openmandriva-linux", -+ "i586-openmandriva-linux-gnu", -+ "i586-openmandriva-linux-musl", -+ "i686-openmandriva-linux", -+ "i686-openmandriva-linux-gnu", -+ "i686-openmandriva-linux-musl" -+ }; - - static const char *const MIPSLibDirs[] = {"/lib"}; - static const char *const MIPSTriples[] = {"mips-linux-gnu", "mips-mti-linux", -@@ -1471,11 +1511,12 @@ bool Generic_GCC::GCCInstallationDetecto - static const char *const PPCLibDirs[] = {"/lib32", "/lib"}; - static const char *const PPCTriples[] = { - "powerpc-linux-gnu", "powerpc-unknown-linux-gnu", "powerpc-linux-gnuspe", -- "powerpc-suse-linux", "powerpc-montavista-linuxspe"}; -+ "powerpc-suse-linux", "powerpc-montavista-linuxspe", -+ "powerpc-mandriva-linux-gnu"}; - static const char *const PPC64LibDirs[] = {"/lib64", "/lib"}; - static const char *const PPC64Triples[] = { - "powerpc64-linux-gnu", "powerpc64-unknown-linux-gnu", -- "powerpc64-suse-linux", "ppc64-redhat-linux"}; -+ "powerpc64-suse-linux", "ppc64-redhat-linux", "powerpc64-mandriva-linux"}; - static const char *const PPC64LELibDirs[] = {"/lib64", "/lib"}; - static const char *const PPC64LETriples[] = { - "powerpc64le-linux-gnu", "powerpc64le-unknown-linux-gnu", -@@ -3386,6 +3427,9 @@ enum Distro { - UbuntuVivid, - UbuntuWily, - UbuntuXenial, -+ Mandriva, -+ OpenMandriva, -+ ROSA, - UnknownDistro - }; - -@@ -3403,6 +3447,10 @@ static bool IsUbuntu(enum Distro Distro) - return Distro >= UbuntuHardy && Distro <= UbuntuXenial; - } - -+static bool IsMandriva(enum Distro Distro) { -+ return Distro >= Mandriva && Distro < UnknownDistro; -+} -+ - static Distro DetectDistro(const Driver &D, llvm::Triple::ArchType Arch) { - llvm::ErrorOr> File = - llvm::MemoryBuffer::getFile("/etc/lsb-release"); -@@ -3411,7 +3459,17 @@ static Distro DetectDistro(const Driver - SmallVector Lines; - Data.split(Lines, "\n"); - Distro Version = UnknownDistro; -- for (StringRef Line : Lines) -+ for (StringRef Line : Lines) { -+ if (Version == UnknownDistro && Line.startswith("DISTRIB_ID=MandrivaLinux")) -+ // It's either Mandriva or a close derivate, will get details -+ // from DISTRIB_DESCRIPTION -+ Version = Mandriva; -+ if (Version == Mandriva && Line.startswith("DISTRIB_DESCRIPTION=")) { -+ if(Line.substr(20).find("ROSA") != StringRef::npos) -+ Version = ROSA; -+ else if(Line.substr(20).find("Open") != StringRef::npos) -+ Version = OpenMandriva; -+ } - if (Version == UnknownDistro && Line.startswith("DISTRIB_CODENAME=")) - Version = llvm::StringSwitch(Line.substr(17)) - .Case("hardy", UbuntuHardy) -@@ -3432,6 +3490,7 @@ static Distro DetectDistro(const Driver - .Case("wily", UbuntuWily) - .Case("xenial", UbuntuXenial) - .Default(UnknownDistro); -+ } - return Version; - } - -@@ -3592,7 +3651,7 @@ static std::string getMultiarchTriple(co - return TargetTriple.str(); - } - --static StringRef getOSLibDir(const llvm::Triple &Triple, const ArgList &Args) { -+static StringRef getOSLibDir(const enum Distro &Distro, const llvm::Triple &Triple, const ArgList &Args) { - if (isMipsArch(Triple.getArch())) { - // lib32 directory has a special meaning on MIPS targets. - // It contains N32 ABI binaries. Use this folder if produce -@@ -3608,11 +3667,15 @@ static StringRef getOSLibDir(const llvm: - // with a 'lib32' library search path being considered. So we only enable - // them when we know we may need it. - // -+ // Also, lib32 is highly distro-specific -- OpenMandriva for one doesn't -+ // use lib32 (64 bit libs go to lib64, 32 bit libs go to lib) -+ // - // FIXME: This is a bit of a hack. We should really unify this code for - // reasoning about oslibdir spellings with the lib dir spellings in the - // GCCInstallationDetector, but that is a more significant refactoring. -- if (Triple.getArch() == llvm::Triple::x86 || -- Triple.getArch() == llvm::Triple::ppc) -+ if (!IsMandriva(Distro) && -+ (Triple.getArch() == llvm::Triple::x86 || -+ Triple.getArch() == llvm::Triple::ppc)) - return "lib32"; - - if (Triple.getArch() == llvm::Triple::x86_64 && -@@ -3645,7 +3708,7 @@ Linux::Linux(const Driver &D, const llvm - - Distro Distro = DetectDistro(D, Arch); - -- if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) { -+ if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || IsMandriva(Distro)) { - ExtraOpts.push_back("-z"); - ExtraOpts.push_back("relro"); - } -@@ -3665,7 +3728,7 @@ Linux::Linux(const Driver &D, const llvm - // ABI requires a mapping between the GOT and the symbol table. - // Android loader does not support .gnu.hash. - if (!IsMips && !IsAndroid) { -- if (IsRedhat(Distro) || IsOpenSUSE(Distro) || -+ if (IsRedhat(Distro) || IsOpenSUSE(Distro) || IsMandriva(Distro) || - (IsUbuntu(Distro) && Distro >= UbuntuMaverick)) - ExtraOpts.push_back("--hash-style=gnu"); - -@@ -3677,12 +3740,12 @@ Linux::Linux(const Driver &D, const llvm - if (IsRedhat(Distro)) - ExtraOpts.push_back("--no-add-needed"); - -- if ((IsDebian(Distro) && Distro >= DebianSqueeze) || IsOpenSUSE(Distro) || -+ if ((IsDebian(Distro) && Distro >= DebianSqueeze) || IsOpenSUSE(Distro) || IsMandriva(Distro) || - (IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) || - (IsUbuntu(Distro) && Distro >= UbuntuKarmic)) - ExtraOpts.push_back("--build-id"); - -- if (IsOpenSUSE(Distro)) -+ if (IsOpenSUSE(Distro) || IsMandriva(Distro)) - ExtraOpts.push_back("--enable-new-dtags"); - - // The selection of paths to try here is designed to match the patterns which -@@ -3692,7 +3755,7 @@ Linux::Linux(const Driver &D, const llvm - // to the link paths. - path_list &Paths = getFilePaths(); - -- const std::string OSLibDir = getOSLibDir(Triple, Args); -+ const std::string OSLibDir = getOSLibDir(Distro, Triple, Args); - const std::string MultiarchTriple = getMultiarchTriple(D, Triple, SysRoot); - - // Add the multilib suffixed paths where they are available. diff --git a/D17567-PR23529-Sema-part-of-attrbute-abi_tag-support.patch b/D17567-PR23529-Sema-part-of-attrbute-abi_tag-support.patch deleted file mode 100644 index eb50cc2..0000000 --- a/D17567-PR23529-Sema-part-of-attrbute-abi_tag-support.patch +++ /dev/null @@ -1,314 +0,0 @@ -diff -Naur cfe-3.8.0.src.orig/docs/ItaniumMangleAbiTags.rst cfe-3.8.0.src/docs/ItaniumMangleAbiTags.rst ---- cfe-3.8.0.src.orig/docs/ItaniumMangleAbiTags.rst 1970-01-01 03:00:00.000000000 +0300 -+++ cfe-3.8.0.src/docs/ItaniumMangleAbiTags.rst 2016-05-15 00:37:17.721321969 +0300 -@@ -0,0 +1,101 @@ -+======== -+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 an 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 does not have 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. -+ -+Example: -+ namespace A { -+ inline namespace B __attribute__((abi_tag)) { -+ struct C { int x; }; -+ } -+ } -+ -+ A::C foo(); -+ -+ gets mangled as: _Z3fooB1Bv (prettified as `foo[abi:B]()`) -+ -+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. Also, for functions, 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 an active tag, as it is -+required from the return type `std::string` but not available. -diff -Naur cfe-3.8.0.src.orig/include/clang/Basic/AttrDocs.td cfe-3.8.0.src/include/clang/Basic/AttrDocs.td ---- cfe-3.8.0.src.orig/include/clang/Basic/AttrDocs.td 2015-12-03 00:58:08.000000000 +0300 -+++ cfe-3.8.0.src/include/clang/Basic/AttrDocs.td 2016-05-15 00:37:17.722321974 +0300 -@@ -1859,3 +1859,16 @@ - - }]; - } -+ -+def AbiTagsDocs : Documentation { -+ let Content = [{ -+The ``abi_tag`` attribute can be applied to a function, variable, class or -+inline namespace declaration to modify the mangled name of the entity. It gives -+the ability to distinguish between different versions of the same entity but -+with different ABI versions supported. For example, a newer version of a class -+could have a different set of data members and thus have a different size. Using -+the ``abi_tag`` attribute, it is possible to have different mangled names for -+a global variable of the class type. Therefor, the old code could keep using -+the old manged name and the new code will use the new mangled name with tags. -+ }]; -+} -diff -Naur cfe-3.8.0.src.orig/include/clang/Basic/Attr.td cfe-3.8.0.src/include/clang/Basic/Attr.td ---- cfe-3.8.0.src.orig/include/clang/Basic/Attr.td 2015-12-03 00:58:08.000000000 +0300 -+++ cfe-3.8.0.src/include/clang/Basic/Attr.td 2016-05-15 00:37:17.721321969 +0300 -@@ -349,6 +349,14 @@ - // Attributes begin here - // - -+def AbiTag : Attr { -+ let Spellings = [GCC<"abi_tag">]; -+ let Args = [VariadicStringArgument<"Tags">]; -+ let Subjects = SubjectList<[Struct, Var, Function, Namespace], ErrorDiag, -+ "ExpectedStructClassVariableFunctionOrInlineNamespace">; -+ let Documentation = [AbiTagsDocs]; -+} -+ - def AddressSpace : TypeAttr { - let Spellings = [GNU<"address_space">]; - let Args = [IntArgument<"AddressSpace">]; -diff -Naur cfe-3.8.0.src.orig/include/clang/Basic/DiagnosticSemaKinds.td cfe-3.8.0.src/include/clang/Basic/DiagnosticSemaKinds.td ---- cfe-3.8.0.src.orig/include/clang/Basic/DiagnosticSemaKinds.td 2016-01-09 15:53:17.000000000 +0300 -+++ cfe-3.8.0.src/include/clang/Basic/DiagnosticSemaKinds.td 2016-05-15 00:37:17.725321992 +0300 -@@ -2434,7 +2434,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|non-K&R-style functions}1">, -+ "interface or protocol declarations|kernel functions|non-K&R-style functions|" -+ "structs, classes, variables, functions, and inline namespaces}1">, - InGroup; - def err_attribute_wrong_decl_type : Error; - def warn_type_attribute_wrong_type : Warning< -@@ -4144,6 +4145,13 @@ - def err_redefinition_extern_inline : Error< - "redefinition of a 'extern inline' function %0 is not supported in " - "%select{C99 mode|C++}1">; -+def warn_attr_abi_tag_namespace : Warning< -+ "'abi_tag' attribute on %select{non-inline|anonymous}0 namespace ignored">, -+ InGroup; -+def err_abi_tag_on_redeclaration : Error< -+ "cannot add 'abi_tag' attribute in a 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 -Naur cfe-3.8.0.src.orig/include/clang/Sema/AttributeList.h cfe-3.8.0.src/include/clang/Sema/AttributeList.h ---- cfe-3.8.0.src.orig/include/clang/Sema/AttributeList.h 2015-12-02 20:07:30.000000000 +0300 -+++ cfe-3.8.0.src/include/clang/Sema/AttributeList.h 2016-05-15 00:37:17.726321998 +0300 -@@ -855,7 +855,8 @@ - ExpectedStructOrTypedef, - ExpectedObjectiveCInterfaceOrProtocol, - ExpectedKernelFunction, -- ExpectedFunctionWithProtoType -+ ExpectedFunctionWithProtoType, -+ ExpectedStructClassVariableFunctionOrInlineNamespace - }; - - } // end namespace clang -diff -Naur cfe-3.8.0.src.orig/lib/Sema/SemaDeclAttr.cpp cfe-3.8.0.src/lib/Sema/SemaDeclAttr.cpp ---- cfe-3.8.0.src.orig/lib/Sema/SemaDeclAttr.cpp 2016-01-13 04:07:35.000000000 +0300 -+++ cfe-3.8.0.src/lib/Sema/SemaDeclAttr.cpp 2016-05-15 00:37:17.732322032 +0300 -@@ -4446,6 +4446,42 @@ - Attr.getRange(), S.Context, Attr.getAttributeSpellingListIndex())); - } - -+static void handleAbiTagAttr(Sema &S, Decl *D, const AttributeList &Attr) { -+ SmallVector Tags; -+ for (unsigned I = 0, E = Attr.getNumArgs(); I != E; ++I) { -+ StringRef Tag; -+ if (!S.checkStringLiteralArgumentAttr(Attr, I, Tag)) -+ return; -+ Tags.push_back(Tag); -+ } -+ -+ if (const auto *NS = dyn_cast(D)) { -+ if (!NS->isInline()) { -+ S.Diag(Attr.getLoc(), diag::warn_attr_abi_tag_namespace) << 0; -+ return; -+ } -+ if (NS->isAnonymousNamespace()) { -+ S.Diag(Attr.getLoc(), diag::warn_attr_abi_tag_namespace) << 1; -+ return; -+ } -+ if (Attr.getNumArgs() == 0) -+ Tags.push_back(NS->getName()); -+ } else if (!checkAttributeAtLeastNumArgs(S, Attr, 1)) -+ return; -+ -+ // Store tags sorted and without duplicates. -+ std::sort(Tags.begin(), Tags.end()); -+ Tags.erase(std::unique(Tags.begin(), Tags.end()), Tags.end()); -+ -+ D->addAttr(::new (S.Context) -+ AbiTagAttr(Attr.getRange(), S.Context, Tags.data(), Tags.size(), -+ Attr.getAttributeSpellingListIndex())); -+ -+ // FIXME: remove this warning as soon as mangled part is ready. -+ S.Diag(Attr.getRange().getBegin(), diag::warn_attribute_ignored) -+ << Attr.getName(); -+} -+ - static void handleARMInterruptAttr(Sema &S, Decl *D, - const AttributeList &Attr) { - // Check the attribute arguments. -@@ -5360,6 +5396,9 @@ - case AttributeList::AT_Thread: - handleDeclspecThreadAttr(S, D, Attr); - break; -+ case AttributeList::AT_AbiTag: -+ handleAbiTagAttr(S, D, Attr); -+ break; - - // Thread safety attributes: - case AttributeList::AT_AssertExclusiveLock: -diff -Naur cfe-3.8.0.src.orig/lib/Sema/SemaDecl.cpp cfe-3.8.0.src/lib/Sema/SemaDecl.cpp ---- cfe-3.8.0.src.orig/lib/Sema/SemaDecl.cpp 2016-01-12 01:41:53.000000000 +0300 -+++ cfe-3.8.0.src/lib/Sema/SemaDecl.cpp 2016-05-15 00:37:17.730322021 +0300 -@@ -2396,6 +2396,24 @@ - } - } - -+ // Re-declaration cannot add abi_tag's. -+ if (const auto *NewAbiTagAttr = New->getAttr()) { -+ if (const auto *OldAbiTagAttr = Old->getAttr()) { -+ for (const auto &NewTag : NewAbiTagAttr->tags()) { -+ if (std::find(OldAbiTagAttr->tags_begin(), OldAbiTagAttr->tags_end(), -+ NewTag) == OldAbiTagAttr->tags_end()) { -+ Diag(NewAbiTagAttr->getLocation(), -+ diag::err_new_abi_tag_on_redeclaration) -+ << NewTag; -+ Diag(OldAbiTagAttr->getLocation(), diag::note_previous_declaration); -+ } -+ } -+ } else { -+ Diag(NewAbiTagAttr->getLocation(), diag::err_abi_tag_on_redeclaration); -+ Diag(Old->getLocation(), diag::note_previous_declaration); -+ } -+ } -+ - if (!Old->hasAttrs()) - return; - -diff -Naur cfe-3.8.0.src.orig/test/SemaCXX/attr-abi-tag-syntax.cpp cfe-3.8.0.src/test/SemaCXX/attr-abi-tag-syntax.cpp ---- cfe-3.8.0.src.orig/test/SemaCXX/attr-abi-tag-syntax.cpp 1970-01-01 03:00:00.000000000 +0300 -+++ cfe-3.8.0.src/test/SemaCXX/attr-abi-tag-syntax.cpp 2016-05-15 00:37:17.733322038 +0300 -@@ -0,0 +1,43 @@ -+// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s -+ -+namespace N1 { -+ -+namespace __attribute__((__abi_tag__)) {} -+// expected-warning@-1 {{'abi_tag' attribute on non-inline namespace ignored}} -+ -+namespace N __attribute__((__abi_tag__)) {} -+// expected-warning@-1 {{'abi_tag' attribute on non-inline namespace ignored}} -+ -+} // namespace N1 -+ -+namespace N2 { -+ -+inline namespace __attribute__((__abi_tag__)) {} -+// expected-warning@-1 {{'abi_tag' attribute on anonymous namespace ignored}} -+ -+inline namespace N __attribute__((__abi_tag__)) {} -+// FIXME: remove this warning as soon as attribute fully supported. -+// expected-warning@-2 {{'__abi_tag__' attribute ignored}} -+ -+} // namespcace N2 -+ -+__attribute__((abi_tag("B", "A"))) extern int a1; -+// FIXME: remove this warning as soon as attribute fully supported. -+// expected-warning@-2 {{'abi_tag' attribute ignored}} -+ -+__attribute__((abi_tag("A", "B"))) extern int a1; -+// expected-note@-1 {{previous declaration is here}} -+// FIXME: remove this warning as soon as attribute fully supported. -+// expected-warning@-3 {{'abi_tag' attribute ignored}} -+ -+__attribute__((abi_tag("A", "C"))) extern int a1; -+// expected-error@-1 {{'abi_tag' C missing in original declaration}} -+// FIXME: remove this warning as soon as attribute fully supported. -+// expected-warning@-3 {{'abi_tag' attribute ignored}} -+ -+extern int a2; -+// expected-note@-1 {{previous declaration is here}} -+__attribute__((abi_tag("A")))extern int a2; -+// expected-error@-1 {{cannot add 'abi_tag' attribute in a redeclaration}} -+// FIXME: remove this warning as soon as attribute fully supported. -+// expected-warning@-3 {{'abi_tag' attribute ignored}} diff --git a/D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.patch b/D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.patch deleted file mode 100644 index b935a10..0000000 --- a/D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.patch +++ /dev/null @@ -1,1237 +0,0 @@ -Index: lib/AST/ItaniumMangle.cpp -=================================================================== ---- lib/AST/ItaniumMangle.cpp -+++ lib/AST/ItaniumMangle.cpp -@@ -214,6 +214,12 @@ - class CXXNameMangler { - ItaniumMangleContextImpl &Context; - raw_ostream &Out; -+ bool NullOut = false; -+ /// In the "DisableDerivedAbiTags" mode derived ABI tags are not calculated. -+ /// This mode is used when mangler creates another mangler recursively to -+ /// calculate ABI tags for the function return value or the variable type. -+ /// Also it is required to avoid infinite recursion in some cases. -+ bool DisableDerivedAbiTags = false; - - /// The "structor" is the top-level declaration being mangled, if - /// that's not a template specialization; otherwise it's the pattern -@@ -263,27 +269,148 @@ - - } FunctionTypeDepth; - -+ // abi_tag is a gcc attribute, taking one or more strings called "tags". -+ // The goal is to annotate against which version of a library an object was -+ // built and to be able to provide backwards compatibility ("dual abi"). -+ // For more information see docs/ItaniumMangleAbiTags.rst. -+ typedef SmallVector AbiTagList; -+ typedef llvm::SmallSetVector AbiTagSet; -+ -+ // 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. -+ class AbiTagState final { -+ //! All abi tags used implicitly or explicitly -+ AbiTagSet UsedAbiTags; -+ //! All explicit abi tags (i.e. not from namespace) -+ AbiTagSet EmittedAbiTags; -+ -+ AbiTagState *&LinkHead; -+ AbiTagState *Parent = nullptr; -+ -+ bool LinkActive = false; -+ -+ public: -+ explicit AbiTagState(AbiTagState *&Head) : LinkHead(Head) { -+ Parent = LinkHead; -+ LinkHead = this; -+ LinkActive = true; -+ } -+ -+ // no copy, no move -+ AbiTagState(const AbiTagState &) = delete; -+ AbiTagState &operator=(const AbiTagState &) = 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 (!isa(ND) && !isa(ND)) { -+ 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); -+ } -+ -+ const AbiTagSet &getUsedAbiTags() const { return UsedAbiTags; } -+ void setUsedAbiTags(const AbiTagSet &AbiTags) { -+ UsedAbiTags = AbiTags; -+ } -+ -+ const AbiTagSet &getEmittedAbiTags() const { -+ return EmittedAbiTags; -+ } -+ -+ private: -+ template -+ void writeSortedUniqueAbiTags(raw_ostream &Out, TagList const &AbiTags) { -+ for (const auto &Tag : AbiTags) { -+ EmittedAbiTags.insert(Tag); -+ Out << "B"; -+ Out << Tag.size(); -+ Out << Tag; -+ } -+ } -+ }; -+ -+ AbiTagState *AbiTags = nullptr; -+ AbiTagState AbiTagsRoot; -+ - llvm::DenseMap Substitutions; - - ASTContext &getASTContext() const { return Context.getASTContext(); } - - public: - CXXNameMangler(ItaniumMangleContextImpl &C, raw_ostream &Out_, -- const NamedDecl *D = nullptr) -- : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(0), -- SeqID(0) { -+ const NamedDecl *D = nullptr, bool NullOut_ = false) -+ : Context(C), Out(Out_), NullOut(NullOut_), Structor(getStructor(D)), -+ StructorType(0), SeqID(0), AbiTagsRoot(AbiTags) { - // These can't be mangled without a ctor type or dtor type. - assert(!D || (!isa(D) && - !isa(D))); - } - CXXNameMangler(ItaniumMangleContextImpl &C, raw_ostream &Out_, - const CXXConstructorDecl *D, CXXCtorType Type) - : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type), -- SeqID(0) { } -+ SeqID(0), AbiTagsRoot(AbiTags) { } - CXXNameMangler(ItaniumMangleContextImpl &C, raw_ostream &Out_, - const CXXDestructorDecl *D, CXXDtorType Type) - : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type), -- SeqID(0) { } -+ SeqID(0), AbiTagsRoot(AbiTags) { } -+ -+ 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) {} - - #if MANGLE_CHECKER - ~CXXNameMangler() { -@@ -298,14 +425,18 @@ - #endif - raw_ostream &getStream() { return Out; } - -+ void disableDerivedAbiTags() { DisableDerivedAbiTags = true; } -+ static bool shouldHaveAbiTags(ItaniumMangleContextImpl &C, const VarDecl *VD); -+ - void mangle(const NamedDecl *D); - 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); - -@@ -336,31 +467,53 @@ - DeclarationName name, - unsigned KnownArity = UnknownArity); - -- void mangleName(const TemplateDecl *TD, -- const TemplateArgument *TemplateArgs, -- unsigned NumTemplateArgs); -- void mangleUnqualifiedName(const NamedDecl *ND) { -- mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity); -+ 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, -+ 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); - bool mangleUnresolvedTypeOrSimpleId(QualType DestroyedType, - StringRef Prefix = ""); -@@ -411,6 +564,13 @@ - void mangleTemplateParameter(unsigned Index); - - void mangleFunctionParam(const ParmVarDecl *parm); -+ -+ void writeAbiTags(const NamedDecl *ND, -+ const AbiTagList *AdditionalAbiTags = nullptr); -+ -+ AbiTagSet getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND); -+ AbiTagList makeAdditionalTagsForFunction(const FunctionDecl *FD); -+ AbiTagList makeAdditionalTagsForVariable(const VarDecl *VD); - }; - - } -@@ -454,13 +614,20 @@ - while (!DC->isNamespace() && !DC->isTranslationUnit()) - DC = getEffectiveParentContext(DC); - if (DC->isTranslationUnit() && D->getFormalLinkage() != InternalLinkage && -+ !CXXNameMangler::shouldHaveAbiTags(*this, VD) && - !isa(D)) - return false; - } - - return true; - } - -+void CXXNameMangler::writeAbiTags(const NamedDecl *ND, -+ const AbiTagList *AdditionalAbiTags) { -+ assert(AbiTags && "require AbiTagState"); -+ AbiTags->write(Out, ND, DisableDerivedAbiTags ? nullptr : AdditionalAbiTags); -+} -+ - void CXXNameMangler::mangle(const NamedDecl *D) { - // ::= _Z - // ::= -@@ -476,14 +643,31 @@ - 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"; -@@ -587,7 +771,24 @@ - 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 auto *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) { - // ::= - // ::= - // ::= -@@ -603,7 +804,7 @@ - while (!DC->isNamespace() && !DC->isTranslationUnit()) - DC = getEffectiveParentContext(DC); - else if (GetLocalClassDecl(ND)) { -- mangleLocalName(ND); -+ mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName); - return; - } - -@@ -613,76 +814,93 @@ - // 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"); - 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"); -+ - 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); - } - -@@ -841,14 +1059,16 @@ - else - Out << "sr"; - mangleSourceName(qualifier->getAsNamespace()->getIdentifier()); -+ writeAbiTags(qualifier->getAsNamespace()); - break; - case NestedNameSpecifier::NamespaceAlias: - if (qualifier->getPrefix()) - mangleUnresolvedPrefix(qualifier->getPrefix(), - /*recursive*/ true); - else - Out << "sr"; - mangleSourceName(qualifier->getAsNamespaceAlias()->getIdentifier()); -+ writeAbiTags(qualifier->getAsNamespaceAlias()); - break; - - case NestedNameSpecifier::TypeSpec: -@@ -883,6 +1103,7 @@ - Out << "sr"; - - mangleSourceName(qualifier->getAsIdentifier()); -+ // an Identifier has no type information, so we can't emit abi tags for it - break; - } - -@@ -928,7 +1149,8 @@ - - void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND, - DeclarationName Name, -- unsigned KnownArity) { -+ unsigned KnownArity, -+ const AbiTagList *AdditionalAbiTags) { - unsigned Arity = KnownArity; - // ::= - // ::= -@@ -947,6 +1169,7 @@ - Out << 'L'; - - mangleSourceName(II); -+ writeAbiTags(ND, AdditionalAbiTags); - break; - } - -@@ -986,6 +1209,7 @@ - assert(FD->getIdentifier() && "Data member name isn't an identifier!"); - - mangleSourceName(FD->getIdentifier()); -+ // Not emitting abi tags: internal name anyway - break; - } - -@@ -1006,6 +1230,10 @@ - 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; - } - -@@ -1015,6 +1243,8 @@ - // ::= + # 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; - } -@@ -1026,11 +1256,13 @@ - if (UnnamedMangle > 1) - Out << UnnamedMangle - 2; - Out << '_'; -+ writeAbiTags(TD, AdditionalAbiTags); - break; - } - -- // Get a unique id for the anonymous struct. -- unsigned AnonStructId = Context.getAnonymousStructId(TD); -+ // Get a unique id for the anonymous struct. If it is not a real output -+ // ID doesn't matter so use fake one. -+ unsigned AnonStructId = NullOut ? 0 : Context.getAnonymousStructId(TD); - - // Mangle it as a source name in the form - // [n] $_ -@@ -1058,6 +1290,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: -@@ -1069,6 +1302,7 @@ - // 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::CXXOperatorName: -@@ -1084,6 +1318,7 @@ - case DeclarationName::CXXConversionFunctionName: - case DeclarationName::CXXLiteralOperatorName: - mangleOperatorName(Name, Arity); -+ writeAbiTags(ND, AdditionalAbiTags); - break; - - case DeclarationName::CXXUsingDirective: -@@ -1100,7 +1335,9 @@ - - void CXXNameMangler::mangleNestedName(const NamedDecl *ND, - const DeclContext *DC, -- bool NoFunction) { -+ const AbiTagList *AdditionalAbiTags, -+ bool NoFunction, -+ bool ExcludeUnqualifiedName) { - // - // ::= N [] [] E - // ::= N [] [] -@@ -1120,30 +1357,36 @@ - // 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 [ ] -@@ -1155,15 +1398,26 @@ - - 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.setUsedAbiTags(LocalAbiTags.getEmittedAbiTags()); -+ } - - Out << 'E'; - -+ // GCC 5.3.0 doesn't emit derived ABI tags for local names but that seems to -+ // be a bug that is fixed in trunk. -+ - 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 -@@ -1188,13 +1442,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 -@@ -1211,30 +1469,37 @@ - } - } - -- mangleUnqualifiedBlock(BD); -+ assert(!AdditionalAbiTags && "Block cannot have additional abi tags"); -+ if (!ExcludeUnqualifiedName) -+ mangleUnqualifiedBlock(BD); - } else { -- mangleUnqualifiedName(cast(D)); -- } -- -- 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) -+ mangleUnqualifiedName(cast(D), AdditionalAbiTags); -+ } -+ -+ 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)); -@@ -1245,10 +1510,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'; - } - } - } -@@ -1281,7 +1547,7 @@ - if (const IdentifierInfo *Name - = cast(Context)->getIdentifier()) { - mangleSourceName(Name); -- Out << 'M'; -+ Out << 'M'; - } - } - } -@@ -1364,11 +1630,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); -@@ -1379,27 +1645,30 @@ - // ::= - // ::= - if (TemplateDecl *TD = Template.getAsTemplateDecl()) -- return mangleTemplatePrefix(TD); -+ return mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr); - - if (QualifiedTemplateName *Qualified = Template.getAsQualifiedTemplateName()) - manglePrefix(Qualified->getQualifier()); -- -+ - 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?"); - if (NestedNameSpecifier *Qualifier = Dependent->getQualifier()) - manglePrefix(Qualifier); -- mangleUnscopedTemplateName(Template); -+ mangleUnscopedTemplateName(Template, /* AdditionalAbiTags */ nullptr); - } - - void CXXNameMangler::mangleTemplatePrefix(const TemplateDecl *ND, -- bool NoFunction) { -+ const AbiTagList *AdditionalAbiTags, -+ bool NoFunction, -+ bool ExcludeUnqualifiedName) { - // ::=