From 1b5c336fc7b2013a619a50895d7a43f3f4334515 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 11 Sep 2012 05:51:06 +0000 Subject: [PATCH] Remove some redundancy from constant aggregate emission. No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163595 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExprConstant.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index 6aa9a8a6d9..ecd835b402 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -814,11 +814,7 @@ public: return llvm::ConstantArray::get(AType, Elts); } - llvm::Constant *EmitStructInitialization(InitListExpr *ILE) { - return ConstStructBuilder::BuildStruct(CGM, CGF, ILE); - } - - llvm::Constant *EmitUnionInitialization(InitListExpr *ILE) { + llvm::Constant *EmitRecordInitialization(InitListExpr *ILE) { return ConstStructBuilder::BuildStruct(CGM, CGF, ILE); } @@ -830,11 +826,8 @@ public: if (ILE->getType()->isArrayType()) return EmitArrayInitialization(ILE); - if (ILE->getType()->isUnionType()) - return EmitUnionInitialization(ILE); - if (ILE->getType()->isRecordType()) - return EmitStructInitialization(ILE); + return EmitRecordInitialization(ILE); return 0; } -- 2.50.1