From: Fariborz Jahanian Date: Wed, 28 Oct 2009 21:07:28 +0000 (+0000) Subject: Minor cleanup. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7a4a436efc11844c0d837a84f284aac7a09f31a;p=clang Minor cleanup. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@85434 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index 345eacb673..818c5162da 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -591,11 +591,13 @@ CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest, const CXXConstructExpr *E) { assert(Dest && "Must have a destination!"); const CXXConstructorDecl *CD = E->getConstructor(); + const ConstantArrayType *Array = + getContext().getAsConstantArrayType(E->getType()); // For a copy constructor, even if it is trivial, must fall thru so // its argument is code-gen'ed. if (!CD->isCopyConstructor(getContext())) { QualType InitType = E->getType(); - if (const ArrayType *Array = getContext().getAsArrayType(InitType)) + if (Array) InitType = getContext().getBaseElementType(Array); const CXXRecordDecl *RD = cast(InitType->getAs()->getDecl()); @@ -609,8 +611,7 @@ CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest, EmitAggExpr((*i), Dest, false); return; } - if (const ConstantArrayType *Array = - getContext().getAsConstantArrayType(E->getType())) { + if (Array) { QualType BaseElementTy = getContext().getBaseElementType(Array); const llvm::Type *BasePtr = ConvertType(BaseElementTy); BasePtr = llvm::PointerType::getUnqual(BasePtr);