Provide a simpler interface for getting a ConstantArray from a character

string. Instead of specifying the length, just specify whether the user
wants a terminating null or not. The default is "true" to retain the same
behavior as previously provided by this function.

llvm-svn: 28562

1 files changed, 4 insertions, 8 deletions

diff --git a/llvm/lib/VMCore/Constants.cpp b/llvm/lib/VMCore/Constants.cpp
index d5f221f5c1f..3351385d0a9 100644
--- a/llvm/lib/VMCore/Constants.cpp
+++ b/llvm/lib/VMCore/Constants.cpp
@@ -930,21 +930,17 @@ void ConstantArray::destroyConstant() {
 /// Otherwise, the length parameter specifies how much of the string to use 
 /// and it won't be null terminated.
 ///
-Constant *ConstantArray::get(const std::string &Str, unsigned length) {
-  assert(length <= Str.length() && "Invalid length for string");
+Constant *ConstantArray::get(const std::string &Str, bool AddNull) {
   std::vector<Constant*> ElementVals;
-
-  unsigned copy_len = (length == 0 ? Str.length() : length);
-  for (unsigned i = 0; i < copy_len; ++i)
+  for (unsigned i = 0; i < Str.length(); ++i)
     ElementVals.push_back(ConstantSInt::get(Type::SByteTy, Str[i]));
 
   // Add a null terminator to the string...
-  if (length == 0) {
+  if (AddNull) {
     ElementVals.push_back(ConstantSInt::get(Type::SByteTy, 0));
-    copy_len++;
   }
 
-  ArrayType *ATy = ArrayType::get(Type::SByteTy, copy_len);
+  ArrayType *ATy = ArrayType::get(Type::SByteTy, ElementVals.size());
   return ConstantArray::get(ATy, ElementVals);
 }