diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-02 23:27:11 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-02 23:27:11 +0000 |
| commit | a3ca41f0c2bd1c4a752df88b283332f3b757d21e (patch) | |
| tree | 8aab234057f7a0c60c5d1bc20ad31ebb07d5977e /lib/CodeGen/CodeGenModule.cpp | |
| parent | 067cc40308a9643400fd291fc8678c4a6785e90c (diff) | |
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
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |