From a3ca41f0c2bd1c4a752df88b283332f3b757d21e Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Fri, 2 Mar 2012 23:27:11 +0000 Subject: Reinstate r151879, r151880, reverted in r151922, along with a bugfix for scalar emission of DeclRefExprs to const bools: emit scalar bools as i1, not as i8. In addition to the extra unit testing, this has successfully bootstrapped. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151955 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/CodeGen/CodeGenModule.cpp') diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index a3a71b7e52..922a5df344 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -1472,7 +1472,8 @@ CodeGenModule::MaybeEmitGlobalStdInitializerListInitializer(const VarDecl *D, } // Emit the constant for the initializer_list. - llvm::Constant *llvmInit = EmitConstantValue(initListValue, D->getType()); + llvm::Constant *llvmInit = + EmitConstantValueForMemory(initListValue, D->getType()); assert(llvmInit && "failed to initialize as constant"); return llvmInit; } -- cgit v1.2.3-70-g09d2