6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-27 13:30:05 +00:00
Code Issues Projects Releases Wiki Activity

Avoid an infinite cycle with private linkage and -f{data|function}-sections.

Browse Source 
When outputting an object we check its section to find its name, but when
looking for the section with -ffunction-section we look for the symbol name.

Break the loop by requesting a name with the private prefix when constructing
the section name. This matches the behavior before r201608.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201622 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-02-19 01:28:30 +00:00
parent 7a8ca279cd
commit faaa553274
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Target/TargetLowering.h
View File

@ -1338,7 +1338,7 @@ public:
} }
void getNameWithPrefix(SmallVectorImpl<char> &Name, const GlobalValue *GV, void getNameWithPrefix(SmallVectorImpl<char> &Name, const GlobalValue *GV,
Mangler &Mang) const; Mangler &Mang, bool MayAlwaysUsePrivate = false) const;
MCSymbol *getSymbol(const GlobalValue *GV, Mangler &Mang) const; MCSymbol *getSymbol(const GlobalValue *GV, Mangler &Mang) const;
private: private:

5
lib/CodeGen/TargetLoweringBase.cpp
View File

@ -1431,8 +1431,9 @@ bool TargetLoweringBase::isLegalAddressingMode(const AddrMode &AM,
void TargetLoweringBase::getNameWithPrefix(SmallVectorImpl<char> &Name, void TargetLoweringBase::getNameWithPrefix(SmallVectorImpl<char> &Name,
const GlobalValue *GV, const GlobalValue *GV,
Mangler &Mang) const { Mangler &Mang,
if (!GV->hasPrivateLinkage()) { bool MayAlwaysUsePrivate) const {
if (MayAlwaysUsePrivate || !GV->hasPrivateLinkage()) {
// Simple case: If GV is not private, it is not important to find out if // Simple case: If GV is not private, it is not important to find out if
// private labels are legal in this case or not. // private labels are legal in this case or not.
Mang.getNameWithPrefix(Name, GV, false); Mang.getNameWithPrefix(Name, GV, false);

6
lib/CodeGen/TargetLoweringObjectFileImpl.cpp
View File

@ -248,12 +248,12 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
Prefix = getSectionPrefixForGlobal(Kind); Prefix = getSectionPrefixForGlobal(Kind);
SmallString<128> Name(Prefix, Prefix+strlen(Prefix)); SmallString<128> Name(Prefix, Prefix+strlen(Prefix));
MCSymbol *Sym = TM.getTargetLowering()->getSymbol(GV, Mang); TM.getTargetLowering()->getNameWithPrefix(Name, GV, Mang, true);
Name.append(Sym->getName().begin(), Sym->getName().end());
StringRef Group = ""; StringRef Group = "";
unsigned Flags = getELFSectionFlags(Kind); unsigned Flags = getELFSectionFlags(Kind);
if (GV->isWeakForLinker()) { if (GV->isWeakForLinker()) {
Group = Sym->getName(); Group = Name.substr(strlen(Prefix));
Flags |= ELF::SHF_GROUP; Flags |= ELF::SHF_GROUP;
} }

8
test/CodeGen/X86/global-sections.ll
View File

@ -168,3 +168,11 @@
; DARWIN: .zerofill __DATA,__common,_G12,1,3 ; DARWIN: .zerofill __DATA,__common,_G12,1,3
; DARWIN: .globl _G13 ; DARWIN: .globl _G13
; DARWIN: .zerofill __DATA,__common,_G13,1,3 ; DARWIN: .zerofill __DATA,__common,_G13,1,3
@G14 = private unnamed_addr constant [4 x i8] c"foo\00", align 1
; LINUX-SECTIONS: .type .LG14,@object # @G14
; LINUX-SECTIONS: .section .rodata..LG14,"aMS",@progbits,1
; LINUX-SECTIONS: .LG14:
; LINUX-SECTIONS: .asciz "foo"
; LINUX-SECTIONS: .size .LG14, 4