2 files changed, 36 insertions, 0 deletions
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index fe88bc9127..bcb51a3efc 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -401,3 +401,30 @@ llvm::Value *CodeGenFunction::EmitVAArg(llvm::Value *VAListAddr, QualType Ty)
   return AddrTyped;
 }
 
+llvm::Value *CodeGenFunction::GetVLASize(const VariableArrayType *VAT)
+{
+  llvm::Value *&SizeEntry = VLASizeMap[VAT];
+
+  if (!SizeEntry) {
+    // Get the element size;
+    llvm::Value *ElemSize;
+  
+    QualType ElemTy = VAT->getElementType();
+
+    if (const VariableArrayType *ElemVAT = 
+        getContext().getAsVariableArrayType(ElemTy))
+      ElemSize = GetVLASize(ElemVAT);
+    else {
+      // FIXME: We use Int32Ty here because the alloca instruction takes a
+      // 32-bit integer. What should we do about overflow?
+      ElemSize = llvm::ConstantInt::get(llvm::Type::Int32Ty, 
+                                        getContext().getTypeSize(ElemTy) / 8);
+    }
+
+    llvm::Value *NumElements = EmitScalarExpr(VAT->getSizeExpr());
+
+    SizeEntry = Builder.CreateMul(ElemSize, NumElements);
+  }
+
+  return SizeEntry;
+}
diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index 952c3b3c1c..5c4246f7c3 100644
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -166,6 +166,11 @@ private:
   /// statement range in current switch instruction.
   llvm::BasicBlock *CaseRangeBlock;
 
+  // VLASizeMap - This keeps track of the associated size for each VLA type
+  // FIXME: Maybe this could be a stack of maps that is pushed/popped as
+  // we enter/leave scopes.
+  llvm::DenseMap<const VariableArrayType*, llvm::Value*> VLASizeMap;
+  
   /// StackSaveValues - A stack(!) of stack save values. When a new scope is
   /// entered, a null is pushed on this stack. If a VLA is emitted, then 
   /// the return value of llvm.stacksave() is stored at the top of this stack.
@@ -344,6 +349,10 @@ public:
   // instruction in LLVM instead once it works well enough.  
   llvm::Value *EmitVAArg(llvm::Value *VAListAddr, QualType Ty);
   
+  // GetVLASize - Returns an LLVM value that corresponds to the size in bytes
+  // of a variable length array type.
+  llvm::Value *GetVLASize(const VariableArrayType *);
+
   //===--------------------------------------------------------------------===//
   //                            Declaration Emission
   //===--------------------------------------------------------------------===//