diff options
Diffstat (limited to 'lib/IR/AutoUpgrade.cpp')
-rw-r--r-- | lib/IR/AutoUpgrade.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/IR/AutoUpgrade.cpp b/lib/IR/AutoUpgrade.cpp index d0fb71f341..e255113aab 100644 --- a/lib/IR/AutoUpgrade.cpp +++ b/lib/IR/AutoUpgrade.cpp @@ -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()); |