[llvm-commits] [dragonegg] r149378 - in /dragonegg/trunk/src: Backend.cpp Constants.cpp

[Benjamin Kramer]

Author: d0k
Date: Tue Jan 31 04:39:36 2012
New Revision: 149378

URL: http://llvm.org/viewvc/llvm-project?rev=149378&view=rev
Log:
ConstantArray::get doesn't do strings anymore.

Modified:
    dragonegg/trunk/src/Backend.cpp
    dragonegg/trunk/src/Constants.cpp

Modified: dragonegg/trunk/src/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Backend.cpp?rev=149378&r1=149377&r2=149378&view=diff
==============================================================================
--- dragonegg/trunk/src/Backend.cpp (original)
+++ dragonegg/trunk/src/Backend.cpp Tue Jan 31 04:39:36 2012
@@ -750,7 +750,7 @@
 /// global if possible.
 Constant* ConvertMetadataStringToGV(const char *str) {
 
-  Constant *Init = ConstantArray::get(getGlobalContext(), std::string(str));
+  Constant *Init = ConstantDataArray::getString(getGlobalContext(), str);
 
   // Use cached string if it exists.
   static std::map<Constant*, GlobalVariable*> StringCSTCache;

Modified: dragonegg/trunk/src/Constants.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Constants.cpp?rev=149378&r1=149377&r2=149378&view=diff
==============================================================================
--- dragonegg/trunk/src/Constants.cpp (original)
+++ dragonegg/trunk/src/Constants.cpp Tue Jan 31 04:39:36 2012
@@ -788,8 +788,8 @@
   assert(CharsWritten == SizeInChars && "Failed to fully encode expression!");
   (void)CharsWritten; // Avoid unused variable warning when assertions disabled.
   // Turn it into an LLVM byte array.
-  return ConstantArray::get(Context, StringRef((char *)&Buffer[0], SizeInChars),
-                            /*AddNull*/false);
+  StringRef Str((char *)&Buffer[0], SizeInChars);
+  return ConstantDataArray::getString(Context, str, /*AddNull*/false);
 }
 
 static Constant *ConvertSTRING_CST(tree exp, TargetFolder &) {