1 files changed, 4 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 1d389b6049..44eefea71d 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -684,7 +684,10 @@ ScalarExprEmitter::VisitSizeOfAlignOfExpr(const SizeOfAlignOfExpr *E) {
         // sizeof(type) - make sure to emit the VLA size.
         CGF.EmitVLASize(TypeToSize);
       }
-      return CGF.GetVLASize(VAT);
+      
+      llvm::Value *VLASize = CGF.GetVLASize(VAT);
+      return Builder.CreateIntCast(VLASize, ConvertType(E->getType()), 
+                                   false, "conv");
     }
   }