diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index dd55d65e163..aed08670932 100644
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -11170,6 +11170,8 @@ static Instruction *InstCombineStoreToCast(InstCombiner &IC, StoreInst &SI) {
     
     while (1) {
       if (const StructType *STy = dyn_cast<StructType>(SrcPTy)) {
+        if (!STy->getNumElements()) /* Void is represented as {} */
+          break;
         NewGEPIndices.push_back(Zero);
         SrcPTy = STy->getElementType(0);
       } else if (const ArrayType *ATy = dyn_cast<ArrayType>(SrcPTy)) {