diff --git a/lib/IR/AutoUpgrade.cpp b/lib/IR/AutoUpgrade.cpp
index d0fb71f341b..e255113aab7 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());
 
diff --git a/test/Bitcode/upgrade-global-ctors.ll b/test/Bitcode/upgrade-global-ctors.ll
new file mode 100644
index 00000000000..bd253a81620
--- /dev/null
+++ b/test/Bitcode/upgrade-global-ctors.ll
@@ -0,0 +1,3 @@
+; RUN:  llvm-dis < %s.bc| FileCheck %s
+
+; CHECK: @llvm.global_ctors = appending global [0 x { i32, void ()*, i8* }] zeroinitializer
diff --git a/test/Bitcode/upgrade-global-ctors.ll.bc b/test/Bitcode/upgrade-global-ctors.ll.bc
new file mode 100644
index 00000000000..927fd91867e
Binary files /dev/null and b/test/Bitcode/upgrade-global-ctors.ll.bc differ