mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
Revert r224935 "Refactor duplicated code. No intended functionality change."
This is affecting the behavior of some ObjC++ / AArch64 test cases on Darwin. Reverting to get the bots green while I track down the source of the changed behavior. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225311 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
6a72b20325
commit
84acf09f32
@ -89,6 +89,8 @@ 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,
|
||||
|
@ -67,6 +67,14 @@ 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
|
||||
/// @{
|
||||
|
||||
|
@ -382,12 +382,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;
|
||||
|
||||
virtual const MCExpr *getExprForPersonalitySymbol(const MCSymbol *Sym,
|
||||
unsigned Encoding,
|
||||
MCStreamer &Streamer) const;
|
||||
|
@ -19,9 +19,9 @@
|
||||
|
||||
namespace llvm {
|
||||
class MCAsmInfoDarwin : public MCAsmInfo {
|
||||
virtual void anchor();
|
||||
public:
|
||||
explicit MCAsmInfoDarwin();
|
||||
bool isSectionAtomizableBySymbols(const MCSection &Section) const override;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -151,6 +151,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;
|
||||
|
||||
protected:
|
||||
virtual const MCSection *
|
||||
SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
|
||||
|
@ -573,6 +573,60 @@ const MCSection *TargetLoweringObjectFileMachO::getExplicitSectionGlobal(
|
||||
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 {
|
||||
|
@ -109,10 +109,6 @@ MCAsmInfo::MCAsmInfo() {
|
||||
MCAsmInfo::~MCAsmInfo() {
|
||||
}
|
||||
|
||||
bool MCAsmInfo::isSectionAtomizableBySymbols(const MCSection &Section) const {
|
||||
return false;
|
||||
}
|
||||
|
||||
const MCExpr *
|
||||
MCAsmInfo::getExprForPersonalitySymbol(const MCSymbol *Sym,
|
||||
unsigned Encoding,
|
||||
|
@ -15,61 +15,10 @@
|
||||
#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;
|
||||
|
||||
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;
|
||||
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
void MCAsmInfoDarwin::anchor() { }
|
||||
|
||||
MCAsmInfoDarwin::MCAsmInfoDarwin() {
|
||||
// Common settings for all Darwin targets.
|
||||
|
@ -12,7 +12,6 @@
|
||||
#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"
|
||||
@ -449,8 +448,8 @@ const MCSymbolData *MCAssembler::getAtom(const MCSymbolData *SD) const {
|
||||
|
||||
// Non-linker visible symbols in sections which can't be atomized have no
|
||||
// defining atom.
|
||||
if (!getContext().getAsmInfo()->isSectionAtomizableBySymbols(
|
||||
SD->getFragment()->getParent()->getSection()))
|
||||
if (!getBackend().isSectionAtomizable(
|
||||
SD->getFragment()->getParent()->getSection()))
|
||||
return nullptr;
|
||||
|
||||
// Otherwise, return the atom for the containing fragment.
|
||||
|
@ -21,8 +21,7 @@
|
||||
namespace llvm {
|
||||
|
||||
class ARMMCAsmInfoDarwin : public MCAsmInfoDarwin {
|
||||
virtual void anchor();
|
||||
|
||||
void anchor() override;
|
||||
public:
|
||||
explicit ARMMCAsmInfoDarwin(StringRef TT);
|
||||
};
|
||||
|
@ -21,8 +21,7 @@ namespace llvm {
|
||||
class Triple;
|
||||
|
||||
class PPCMCAsmInfoDarwin : public MCAsmInfoDarwin {
|
||||
virtual void anchor();
|
||||
|
||||
void anchor() override;
|
||||
public:
|
||||
explicit PPCMCAsmInfoDarwin(bool is64Bit, const Triple&);
|
||||
};
|
||||
|
@ -270,6 +270,12 @@ SectionForGlobal(const GlobalValue *GV, SectionKind Kind, Mangler &Mang,
|
||||
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.
|
||||
|
@ -182,8 +182,7 @@ void TargetMachine::getNameWithPrefix(SmallVectorImpl<char> &Name,
|
||||
const TargetLoweringObjectFile &TLOF =
|
||||
getSubtargetImpl()->getTargetLowering()->getObjFileLowering();
|
||||
const MCSection *TheSection = TLOF.SectionForGlobal(GV, GVKind, Mang, *this);
|
||||
bool CannotUsePrivateLabel =
|
||||
AsmInfo->isSectionAtomizableBySymbols(*TheSection);
|
||||
bool CannotUsePrivateLabel = TLOF.isSectionAtomizableBySymbols(*TheSection);
|
||||
Mang.getNameWithPrefix(Name, GV, CannotUsePrivateLabel);
|
||||
}
|
||||
|
||||
|
@ -790,6 +790,26 @@ 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 {
|
||||
|
@ -23,8 +23,7 @@ namespace llvm {
|
||||
class Triple;
|
||||
|
||||
class X86MCAsmInfoDarwin : public MCAsmInfoDarwin {
|
||||
virtual void anchor();
|
||||
|
||||
void anchor() override;
|
||||
public:
|
||||
explicit X86MCAsmInfoDarwin(const Triple &Triple);
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user