commit 94010695f7fce626e41ef045b60def9c912e9ce8
author Chris Lattner <sabre@nondot.org> Sun Feb 05 02:30:40 2012 +0000
committer Chris Lattner <sabre@nondot.org> Sun Feb 05 02:30:40 2012 +0000
tree d37f138171025877b562c0f09e89e49bee81ebc2
parent f7ccbad5d9949e7ddd1cbef43d482553b811e026

reapply the patches reverted in r149477, which enable ConstantDataArray.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149801 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGObjCGNU.cpp

diff --git a/lib/CodeGen/CGObjCGNU.cpp b/lib/CodeGen/CGObjCGNU.cpp
index 2a3c36c..50ab7d2 100644
--- a/lib/CodeGen/CGObjCGNU.cpp
+++ b/lib/CodeGen/CGObjCGNU.cpp
@@ -186,7 +186,7 @@
     std::string name = prefix + Str;
     llvm::Constant *ConstStr = TheModule.getGlobalVariable(name);
     if (!ConstStr) {
-      llvm::Constant *value = llvm::ConstantArray::get(VMContext, Str, true);
+      llvm::Constant *value = llvm::ConstantDataArray::getString(VMContext,Str);
       ConstStr = new llvm::GlobalVariable(TheModule, value->getType(), true,
               llvm::GlobalValue::LinkOnceODRLinkage, value, prefix + Str);
     }