RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:43:36 +01:00
Code Issues Projects Releases Wiki Activity

Handle ConstantAggregateZero when upgrading global_ctors.

Browse Source 
llvm-svn: 209075
This commit is contained in:
Rafael Espindola 2014-05-17 21:00:22 +00:00
parent abf16ae0ea
commit dff2e7bcac
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/IR/AutoUpgrade.cpp
View File

@ -191,16 +191,19 @@ static bool UpgradeGlobalStructors(GlobalVariable *GV) {
StructType::get(GV->getContext(), Tys, /*isPacked=*/false);
// Build new constants with a null third field filled in.
ConstantArray *OldInit = dyn_cast<ConstantArray>(GV->getInitializer());
if (!OldInit)
Constant *OldInitC = GV->getInitializer();
ConstantArray *OldInit = dyn_cast<ConstantArray>(OldInitC);
if (!OldInit && !isa<ConstantAggregateZero>(OldInitC))
return false;
std::vector<Constant *> Initializers;
for (Use &U : OldInit->operands()) {
ConstantStruct *Init = cast<ConstantStruct>(&U);
Constant *NewInit =
if (OldInit) {
for (Use &U : OldInit->operands()) {
ConstantStruct *Init = cast<ConstantStruct>(&U);
Constant *NewInit =
ConstantStruct::get(NewTy, Init->getOperand(0), Init->getOperand(1),
Constant::getNullValue(VoidPtrTy), nullptr);
Initializers.push_back(NewInit);
Initializers.push_back(NewInit);
}
}
assert(Initializers.size() == ATy->getNumElements());

3
test/Bitcode/upgrade-global-ctors.ll Normal file
View File

@ -0,0 +1,3 @@
; RUN: llvm-dis < %s.bc| FileCheck %s
; CHECK: @llvm.global_ctors = appending global [0 x { i32, void ()*, i8* }] zeroinitializer

BIN
test/Bitcode/upgrade-global-ctors.ll.bc Normal file
View File

Binary file not shown.