[llvm] r225534 - Recommit r224935 with a fix for the ObjC++/AArch64 bug that that revision
Rafael Espíndola
rafael.espindola at gmail.com
Fri Jan 9 11:03:50 PST 2015
Thanks!
On 9 January 2015 at 13:55, Lang Hames <lhames at gmail.com> wrote:
> Author: lhames
> Date: Fri Jan 9 12:55:42 2015
> New Revision: 225534
>
> URL: http://llvm.org/viewvc/llvm-project?rev=225534&view=rev
> Log:
> Recommit r224935 with a fix for the ObjC++/AArch64 bug that that revision
> introduced.
>
> A test case for the bug was already committed in r225385.
>
> Patch by Rafael Espindola.
>
>
> Modified:
> llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
> llvm/trunk/include/llvm/MC/MCAsmBackend.h
> llvm/trunk/include/llvm/MC/MCAsmInfo.h
> llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h
> llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h
> llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
> llvm/trunk/lib/MC/MCAsmInfo.cpp
> llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp
> llvm/trunk/lib/MC/MCAssembler.cpp
> llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h
> llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h
> llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp
> llvm/trunk/lib/Target/TargetMachine.cpp
> llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
> llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h
>
> Modified: llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h Fri Jan 9 12:55:42 2015
> @@ -89,8 +89,6 @@ public:
> ArrayRef<Module::ModuleFlagEntry> ModuleFlags,
> Mangler &Mang, const TargetMachine &TM) const override;
>
> - bool isSectionAtomizableBySymbols(const MCSection &Section) const override;
> -
> const MCSection *
> SelectSectionForGlobal(const GlobalValue *GV,
> SectionKind Kind, Mangler &Mang,
>
> Modified: llvm/trunk/include/llvm/MC/MCAsmBackend.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmBackend.h?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/MC/MCAsmBackend.h (original)
> +++ llvm/trunk/include/llvm/MC/MCAsmBackend.h Fri Jan 9 12:55:42 2015
> @@ -67,14 +67,6 @@ public:
> return false;
> }
>
> - /// isSectionAtomizable - Check whether the given section can be split into
> - /// atoms.
> - ///
> - /// \see MCAssembler::isSymbolLinkerVisible().
> - virtual bool isSectionAtomizable(const MCSection &Section) const {
> - return true;
> - }
> -
> /// @name Target Fixup Interfaces
> /// @{
>
>
> Modified: llvm/trunk/include/llvm/MC/MCAsmInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmInfo.h?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/MC/MCAsmInfo.h (original)
> +++ llvm/trunk/include/llvm/MC/MCAsmInfo.h Fri Jan 9 12:55:42 2015
> @@ -382,6 +382,12 @@ public:
> return nullptr;
> }
>
> + /// \brief True if the section is atomized using the symbols in it.
> + /// This is false if the section is not atomized at all (most ELF sections) or
> + /// if it is atomized based on its contents (MachO' __TEXT,__cstring for
> + /// example).
> + virtual bool isSectionAtomizableBySymbols(const MCSection &Section) const;
> +
> virtual const MCExpr *getExprForPersonalitySymbol(const MCSymbol *Sym,
> unsigned Encoding,
> MCStreamer &Streamer) const;
>
> Modified: llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h (original)
> +++ llvm/trunk/include/llvm/MC/MCAsmInfoDarwin.h Fri Jan 9 12:55:42 2015
> @@ -19,9 +19,9 @@
>
> namespace llvm {
> class MCAsmInfoDarwin : public MCAsmInfo {
> - virtual void anchor();
> public:
> explicit MCAsmInfoDarwin();
> + bool isSectionAtomizableBySymbols(const MCSection &Section) const override;
> };
> }
>
>
> Modified: llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h (original)
> +++ llvm/trunk/include/llvm/Target/TargetLoweringObjectFile.h Fri Jan 9 12:55:42 2015
> @@ -151,12 +151,6 @@ public:
> return nullptr;
> }
>
> - /// \brief True if the section is atomized using the symbols in it.
> - /// This is false if the section is not atomized at all (most ELF sections) or
> - /// if it is atomized based on its contents (MachO' __TEXT,__cstring for
> - /// example).
> - virtual bool isSectionAtomizableBySymbols(const MCSection &Section) const;
> -
> protected:
> virtual const MCSection *
> SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
>
> Modified: llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp (original)
> +++ llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp Fri Jan 9 12:55:42 2015
> @@ -573,60 +573,6 @@ const MCSection *TargetLoweringObjectFil
> return S;
> }
>
> -bool TargetLoweringObjectFileMachO::isSectionAtomizableBySymbols(
> - const MCSection &Section) const {
> - const MCSectionMachO &SMO = static_cast<const MCSectionMachO&>(Section);
> -
> - // Sections holding 1 byte strings are atomized based on the data
> - // they contain.
> - // Sections holding 2 byte strings require symbols in order to be
> - // atomized.
> - // There is no dedicated section for 4 byte strings.
> - if (SMO.getKind().isMergeable1ByteCString())
> - return false;
> -
> - if (SMO.getSegmentName() == "__TEXT" &&
> - SMO.getSectionName() == "__objc_classname" &&
> - SMO.getType() == MachO::S_CSTRING_LITERALS)
> - return false;
> -
> - if (SMO.getSegmentName() == "__TEXT" &&
> - SMO.getSectionName() == "__objc_methname" &&
> - SMO.getType() == MachO::S_CSTRING_LITERALS)
> - return false;
> -
> - if (SMO.getSegmentName() == "__TEXT" &&
> - SMO.getSectionName() == "__objc_methtype" &&
> - SMO.getType() == MachO::S_CSTRING_LITERALS)
> - return false;
> -
> - if (SMO.getSegmentName() == "__DATA" &&
> - SMO.getSectionName() == "__cfstring")
> - return false;
> -
> - // no_dead_strip sections are not atomized in practice.
> - if (SMO.hasAttribute(MachO::S_ATTR_NO_DEAD_STRIP))
> - return false;
> -
> - switch (SMO.getType()) {
> - default:
> - return true;
> -
> - // These sections are atomized at the element boundaries without using
> - // symbols.
> - case MachO::S_4BYTE_LITERALS:
> - case MachO::S_8BYTE_LITERALS:
> - case MachO::S_16BYTE_LITERALS:
> - case MachO::S_LITERAL_POINTERS:
> - case MachO::S_NON_LAZY_SYMBOL_POINTERS:
> - case MachO::S_LAZY_SYMBOL_POINTERS:
> - case MachO::S_MOD_INIT_FUNC_POINTERS:
> - case MachO::S_MOD_TERM_FUNC_POINTERS:
> - case MachO::S_INTERPOSING:
> - return false;
> - }
> -}
> -
> const MCSection *TargetLoweringObjectFileMachO::
> SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
> Mangler &Mang, const TargetMachine &TM) const {
>
> Modified: llvm/trunk/lib/MC/MCAsmInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfo.cpp?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/MC/MCAsmInfo.cpp (original)
> +++ llvm/trunk/lib/MC/MCAsmInfo.cpp Fri Jan 9 12:55:42 2015
> @@ -109,6 +109,10 @@ MCAsmInfo::MCAsmInfo() {
> MCAsmInfo::~MCAsmInfo() {
> }
>
> +bool MCAsmInfo::isSectionAtomizableBySymbols(const MCSection &Section) const {
> + return false;
> +}
> +
> const MCExpr *
> MCAsmInfo::getExprForPersonalitySymbol(const MCSymbol *Sym,
> unsigned Encoding,
>
> Modified: llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp (original)
> +++ llvm/trunk/lib/MC/MCAsmInfoDarwin.cpp Fri Jan 9 12:55:42 2015
> @@ -15,10 +15,57 @@
> #include "llvm/MC/MCAsmInfoDarwin.h"
> #include "llvm/MC/MCContext.h"
> #include "llvm/MC/MCExpr.h"
> +#include "llvm/MC/MCSectionMachO.h"
> #include "llvm/MC/MCStreamer.h"
> using namespace llvm;
>
> -void MCAsmInfoDarwin::anchor() { }
> +bool MCAsmInfoDarwin::isSectionAtomizableBySymbols(
> + const MCSection &Section) const {
> + const MCSectionMachO &SMO = static_cast<const MCSectionMachO &>(Section);
> +
> + // Sections holding 1 byte strings are atomized based on the data they
> + // contain.
> + // Sections holding 2 byte strings require symbols in order to be atomized.
> + // There is no dedicated section for 4 byte strings.
> + if (SMO.getKind().isMergeable1ByteCString())
> + return false;
> +
> + if (SMO.getSegmentName() == "__TEXT" &&
> + SMO.getSectionName() == "__objc_classname" &&
> + SMO.getType() == MachO::S_CSTRING_LITERALS)
> + return false;
> +
> + if (SMO.getSegmentName() == "__TEXT" &&
> + SMO.getSectionName() == "__objc_methname" &&
> + SMO.getType() == MachO::S_CSTRING_LITERALS)
> + return false;
> +
> + if (SMO.getSegmentName() == "__TEXT" &&
> + SMO.getSectionName() == "__objc_methtype" &&
> + SMO.getType() == MachO::S_CSTRING_LITERALS)
> + return false;
> +
> + if (SMO.getSegmentName() == "__DATA" && SMO.getSectionName() == "__cfstring")
> + return false;
> +
> + switch (SMO.getType()) {
> + default:
> + return true;
> +
> + // These sections are atomized at the element boundaries without using
> + // symbols.
> + case MachO::S_4BYTE_LITERALS:
> + case MachO::S_8BYTE_LITERALS:
> + case MachO::S_16BYTE_LITERALS:
> + case MachO::S_LITERAL_POINTERS:
> + case MachO::S_NON_LAZY_SYMBOL_POINTERS:
> + case MachO::S_LAZY_SYMBOL_POINTERS:
> + case MachO::S_MOD_INIT_FUNC_POINTERS:
> + case MachO::S_MOD_TERM_FUNC_POINTERS:
> + case MachO::S_INTERPOSING:
> + return false;
> + }
> +}
>
> MCAsmInfoDarwin::MCAsmInfoDarwin() {
> // Common settings for all Darwin targets.
>
> Modified: llvm/trunk/lib/MC/MCAssembler.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAssembler.cpp?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/MC/MCAssembler.cpp (original)
> +++ llvm/trunk/lib/MC/MCAssembler.cpp Fri Jan 9 12:55:42 2015
> @@ -12,6 +12,7 @@
> #include "llvm/ADT/StringExtras.h"
> #include "llvm/ADT/Twine.h"
> #include "llvm/MC/MCAsmBackend.h"
> +#include "llvm/MC/MCAsmInfo.h"
> #include "llvm/MC/MCAsmLayout.h"
> #include "llvm/MC/MCCodeEmitter.h"
> #include "llvm/MC/MCContext.h"
> @@ -448,8 +449,8 @@ const MCSymbolData *MCAssembler::getAtom
>
> // Non-linker visible symbols in sections which can't be atomized have no
> // defining atom.
> - if (!getBackend().isSectionAtomizable(
> - SD->getFragment()->getParent()->getSection()))
> + if (!getContext().getAsmInfo()->isSectionAtomizableBySymbols(
> + SD->getFragment()->getParent()->getSection()))
> return nullptr;
>
> // Otherwise, return the atom for the containing fragment.
>
> Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h (original)
> +++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.h Fri Jan 9 12:55:42 2015
> @@ -21,7 +21,8 @@
> namespace llvm {
>
> class ARMMCAsmInfoDarwin : public MCAsmInfoDarwin {
> - void anchor() override;
> + virtual void anchor();
> +
> public:
> explicit ARMMCAsmInfoDarwin(StringRef TT);
> };
>
> Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h (original)
> +++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h Fri Jan 9 12:55:42 2015
> @@ -21,7 +21,8 @@ namespace llvm {
> class Triple;
>
> class PPCMCAsmInfoDarwin : public MCAsmInfoDarwin {
> - void anchor() override;
> + virtual void anchor();
> +
> public:
> explicit PPCMCAsmInfoDarwin(bool is64Bit, const Triple&);
> };
>
> Modified: llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp (original)
> +++ llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp Fri Jan 9 12:55:42 2015
> @@ -270,12 +270,6 @@ SectionForGlobal(const GlobalValue *GV,
> return SelectSectionForGlobal(GV, Kind, Mang, TM);
> }
>
> -bool TargetLoweringObjectFile::isSectionAtomizableBySymbols(
> - const MCSection &Section) const {
> - return false;
> -}
> -
> -
> /// getSectionForConstant - Given a mergable constant with the
> /// specified size and relocation information, return a section that it
> /// should be placed in.
>
> Modified: llvm/trunk/lib/Target/TargetMachine.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetMachine.cpp?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/TargetMachine.cpp (original)
> +++ llvm/trunk/lib/Target/TargetMachine.cpp Fri Jan 9 12:55:42 2015
> @@ -21,6 +21,7 @@
> #include "llvm/MC/MCAsmInfo.h"
> #include "llvm/MC/MCCodeGenInfo.h"
> #include "llvm/MC/MCContext.h"
> +#include "llvm/MC/MCSectionMachO.h"
> #include "llvm/MC/MCTargetOptions.h"
> #include "llvm/MC/SectionKind.h"
> #include "llvm/Support/CommandLine.h"
> @@ -169,6 +170,19 @@ void TargetMachine::setDataSections(bool
> Options.DataSections = V;
> }
>
> +static bool canUsePrivateLabel(const MCAsmInfo &AsmInfo,
> + const MCSection &Section) {
> + if (!AsmInfo.isSectionAtomizableBySymbols(Section))
> + return true;
> +
> + // If it is not dead stripped, it is safe to use private labels.
> + const MCSectionMachO &SMO = cast<MCSectionMachO>(Section);
> + if (SMO.hasAttribute(MachO::S_ATTR_NO_DEAD_STRIP))
> + return true;
> +
> + return false;
> +}
> +
> void TargetMachine::getNameWithPrefix(SmallVectorImpl<char> &Name,
> const GlobalValue *GV, Mangler &Mang,
> bool MayAlwaysUsePrivate) const {
> @@ -182,7 +196,7 @@ void TargetMachine::getNameWithPrefix(Sm
> const TargetLoweringObjectFile &TLOF =
> getSubtargetImpl()->getTargetLowering()->getObjFileLowering();
> const MCSection *TheSection = TLOF.SectionForGlobal(GV, GVKind, Mang, *this);
> - bool CannotUsePrivateLabel = TLOF.isSectionAtomizableBySymbols(*TheSection);
> + bool CannotUsePrivateLabel = !canUsePrivateLabel(*AsmInfo, *TheSection);
> Mang.getNameWithPrefix(Name, GV, CannotUsePrivateLabel);
> }
>
>
> Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp (original)
> +++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp Fri Jan 9 12:55:42 2015
> @@ -790,26 +790,6 @@ public:
> return SMO.getType() == MachO::S_CSTRING_LITERALS;
> }
>
> - bool isSectionAtomizable(const MCSection &Section) const override {
> - const MCSectionMachO &SMO = static_cast<const MCSectionMachO&>(Section);
> - // Fixed sized data sections are uniqued, they cannot be diced into atoms.
> - switch (SMO.getType()) {
> - default:
> - return true;
> -
> - case MachO::S_4BYTE_LITERALS:
> - case MachO::S_8BYTE_LITERALS:
> - case MachO::S_16BYTE_LITERALS:
> - case MachO::S_LITERAL_POINTERS:
> - case MachO::S_NON_LAZY_SYMBOL_POINTERS:
> - case MachO::S_LAZY_SYMBOL_POINTERS:
> - case MachO::S_MOD_INIT_FUNC_POINTERS:
> - case MachO::S_MOD_TERM_FUNC_POINTERS:
> - case MachO::S_INTERPOSING:
> - return false;
> - }
> - }
> -
> /// \brief Generate the compact unwind encoding for the CFI instructions.
> uint32_t generateCompactUnwindEncoding(
> ArrayRef<MCCFIInstruction> Instrs) const override {
>
> Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h?rev=225534&r1=225533&r2=225534&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h (original)
> +++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.h Fri Jan 9 12:55:42 2015
> @@ -23,7 +23,8 @@ namespace llvm {
> class Triple;
>
> class X86MCAsmInfoDarwin : public MCAsmInfoDarwin {
> - void anchor() override;
> + virtual void anchor();
> +
> public:
> explicit X86MCAsmInfoDarwin(const Triple &Triple);
> };
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list