RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-21 03:05:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Now that RelocBehaviour() is never overloaded, it doesn't need to be

Browse Source 
virtual.  Just inline it into its two current call sites in preparation
for simplifying the code.

llvm-svn: 76686
This commit is contained in:
Chris Lattner 2009-07-21 23:47:11 +00:00
parent 626e2c87ee
commit b9332126cc
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/Target/TargetAsmInfo.h
View File

@ -601,13 +601,6 @@ namespace llvm {
virtual SectionKind::Kind
SectionKindForGlobal(const GlobalValue *GV) const;
/// RelocBehaviour - Describes how relocations should be treated when
/// selecting sections. Reloc::Global bit should be set if global
/// relocations should force object to be placed in read-write
/// sections. Reloc::Local bit should be set if local relocations should
/// force object to be placed in read-write sections.
virtual unsigned RelocBehaviour() const;
/// SectionFlagsForGlobal - This hook allows the target to select proper
/// section flags either for given global or for section.
// FIXME: Eliminate this.

8
lib/Target/ELFTargetAsmInfo.cpp
View File

@ -57,7 +57,13 @@ ELFTargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
if (GVar->hasInitializer()) {
Constant *C = GVar->getInitializer();
bool isConstant = GVar->isConstant();
unsigned Reloc = RelocBehaviour();
// By default - all relocations in PIC mode would force symbol to be
// placed in r/w section.
unsigned Reloc = (TM.getRelocationModel() != Reloc::Static ?
Reloc::LocalOrGlobal : Reloc::None);
if (Reloc != Reloc::None && C->ContainsRelocations(Reloc))
return (C->ContainsRelocations(Reloc::Global) ?
(isConstant ?

12
lib/Target/TargetAsmInfo.cpp
View File

@ -190,13 +190,6 @@ static bool isConstantString(const Constant *C) {
return false;
}
unsigned TargetAsmInfo::RelocBehaviour() const {
// By default - all relocations in PIC mode would force symbol to be
// placed in r/w section.
return (TM.getRelocationModel() != Reloc::Static ?
Reloc::LocalOrGlobal : Reloc::None);
}
SectionKind::Kind
TargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
// Early exit - functions should be always in text sections.
@ -211,13 +204,14 @@ TargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
// Variable can be easily put to BSS section.
return (isThreadLocal ? SectionKind::ThreadBSS : SectionKind::BSS);
} else if (GVar->isConstant() && !isThreadLocal) {
// Now we know, that varible has initializer and it is constant. We need to
// Now we know, that variable has initializer and it is constant. We need to
// check its initializer to decide, which section to output it into. Also
// note, there is no thread-local r/o section.
Constant *C = GVar->getInitializer();
if (C->ContainsRelocations(Reloc::LocalOrGlobal)) {
// Decide, whether it is still possible to put symbol into r/o section.
unsigned Reloc = RelocBehaviour();
unsigned Reloc = (TM.getRelocationModel() != Reloc::Static ?
Reloc::LocalOrGlobal : Reloc::None);
// We already did a query for 'all' relocs, thus - early exits.
if (Reloc == Reloc::LocalOrGlobal)