1 files changed, 1 insertions, 6 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 3bf6b2f809..18ccb27301 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -712,12 +712,7 @@ LValue CodeGenFunction::EmitArraySubscriptExpr(const ArraySubscriptExpr *E) {
     
     Idx = Builder.CreateMul(Idx, VLASize);
     
-    QualType BaseType = VAT->getElementType();
-    
-    // Divide by the element size.
-    while (const VariableArrayType *AT = 
-           getContext().getAsVariableArrayType(BaseType))
-      BaseType = AT->getElementType();
+    QualType BaseType = getContext().getBaseElementType(VAT);
   
     uint64_t BaseTypeSize = getContext().getTypeSize(BaseType) / 8;
     Idx = Builder.CreateUDiv(Idx,