From ccbe9200f9f3ec2062a235f7377024db50cbb2f9 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Fri, 12 Dec 2008 07:19:02 +0000 Subject: [PATCH] Add map of VLA types and their sizes llvm-svn: 60939 --- clang/lib/CodeGen/CodeGenFunction.cpp | 27 +++++++++++++++++++++++++++ clang/lib/CodeGen/CodeGenFunction.h | 9 +++++++++ 2 files changed, 36 insertions(+) diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index fe88bc912727..bcb51a3efc65 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/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/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h index 952c3b3c1c71..5c4246f7c315 100644 --- a/clang/lib/CodeGen/CodeGenFunction.h +++ b/clang/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 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 //===--------------------------------------------------------------------===//