6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-29 10:25:12 +00:00
Code Issues Projects Releases Wiki Activity

Don't emit structors for available_externally globals (PR19933)

Browse Source 
We would previously assert here when trying to figure out the section
for the global.

This makes us handle the situation more gracefully since the IR isn't
malformed.

Differential Revision: http://reviews.llvm.org/D4022

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210215 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Hans Wennborg
2014-06-04 21:04:54 +00:00
parent cfee6c49ea
commit 6248abf28d
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View File

@@ -1349,9 +1349,14 @@ void AsmPrinter::EmitXXStructorList(const Constant *List, bool isCtor) {
const TargetLoweringObjectFile &Obj = getObjFileLowering(); const TargetLoweringObjectFile &Obj = getObjFileLowering();
const MCSymbol *KeySym = nullptr; const MCSymbol *KeySym = nullptr;
const MCSection *KeySec = nullptr; const MCSection *KeySec = nullptr;
if (S.ComdatKey) { if (GlobalValue *GV = S.ComdatKey) {
KeySym = getSymbol(S.ComdatKey); if (GV->hasAvailableExternallyLinkage())
KeySec = getObjFileLowering().SectionForGlobal(S.ComdatKey, *Mang, TM); // If the associated variable is available_externally, some other TU
// will provide its dynamic initializer.
continue;
KeySym = getSymbol(GV);
KeySec = getObjFileLowering().SectionForGlobal(GV, *Mang, TM);
} }
const MCSection *OutputSection = const MCSection *OutputSection =
(isCtor ? Obj.getStaticCtorSection(S.Priority, KeySym, KeySec) (isCtor ? Obj.getStaticCtorSection(S.Priority, KeySym, KeySec)

14
test/MC/COFF/global_ctors_dtors.ll
View File

@@ -11,9 +11,10 @@
%ini = type { i32, void()*, i8* } %ini = type { i32, void()*, i8* }
@llvm.global_ctors = appending global [2 x %ini ] [ @llvm.global_ctors = appending global [3 x %ini ] [
%ini { i32 65535, void ()* @a_global_ctor, i8* null }, %ini { i32 65535, void ()* @a_global_ctor, i8* null },
%ini { i32 65535, void ()* @b_global_ctor, i8* bitcast (i32* @b to i8*) } %ini { i32 65535, void ()* @b_global_ctor, i8* bitcast (i32* @b to i8*) },
%ini { i32 65535, void ()* @c_global_ctor, i8* bitcast (i32* @c to i8*) }
] ]
@llvm.global_dtors = appending global [1 x %ini ] [%ini { i32 65535, void ()* @a_global_dtor, i8* null }] @llvm.global_dtors = appending global [1 x %ini ] [%ini { i32 65535, void ()* @a_global_dtor, i8* null }]
@@ -26,11 +27,18 @@ define void @a_global_ctor() nounwind {
@b = global i32 zeroinitializer @b = global i32 zeroinitializer
@c = available_externally dllimport global i32 zeroinitializer
define void @b_global_ctor() nounwind { define void @b_global_ctor() nounwind {
store i32 42, i32* @b store i32 42, i32* @b
ret void ret void
} }
define void @c_global_ctor() nounwind {
store i32 42, i32* @c
ret void
}
define void @a_global_dtor() nounwind { define void @a_global_dtor() nounwind {
%1 = call i32 @puts(i8* getelementptr inbounds ([12 x i8]* @.str2, i32 0, i32 0)) %1 = call i32 @puts(i8* getelementptr inbounds ([12 x i8]* @.str2, i32 0, i32 0))
ret void ret void
@@ -45,11 +53,13 @@ define i32 @main() nounwind {
; WIN32: a_global_ctor ; WIN32: a_global_ctor
; WIN32: .section .CRT$XCU,"rd",associative .bss,{{_?}}b ; WIN32: .section .CRT$XCU,"rd",associative .bss,{{_?}}b
; WIN32: b_global_ctor ; WIN32: b_global_ctor
; WIN32-NOT: c_global_ctor
; WIN32: .section .CRT$XTX,"rd" ; WIN32: .section .CRT$XTX,"rd"
; WIN32: a_global_dtor ; WIN32: a_global_dtor
; MINGW32: .section .ctors,"wd" ; MINGW32: .section .ctors,"wd"
; MINGW32: a_global_ctor ; MINGW32: a_global_ctor
; MINGW32: .section .ctors,"wd",associative .bss,{{_?}}b ; MINGW32: .section .ctors,"wd",associative .bss,{{_?}}b
; MINGW32: b_global_ctor ; MINGW32: b_global_ctor
; MINGW32-NOT: c_global_ctor
; MINGW32: .section .dtors,"wd" ; MINGW32: .section .dtors,"wd"
; MINGW32: a_global_dtor ; MINGW32: a_global_dtor