From 461bed2b753c514ac15ff824befe585988408f45 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Tue, 30 May 2006 18:15:07 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28562 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Constants.h | 12 ++++++------ lib/VMCore/Constants.cpp | 12 ++++-------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/include/llvm/Constants.h b/include/llvm/Constants.h index dc7e698cf6b..cce4d49d1fb 100644 --- a/include/llvm/Constants.h +++ b/include/llvm/Constants.h @@ -347,12 +347,12 @@ public: static Constant *get(const ArrayType *T, const std::vector &); /// This method constructs a ConstantArray and initializes it with a text - /// string. The default behavior (len==0) causes the null terminator to - /// be copied as well. However, in some situations this is not desired so - /// if len <= Initializer.length() (but not 0) then only that portion of - /// the string is copied and there is no null termination. If len > - /// than Initializer's length then the function asserts out (don't do that). - static Constant *get(const std::string &Initializer, unsigned len = 0); + /// string. The default behavior (AddNull==true) causes a null terminator to + /// be placed at the end of the array. This effectively increases the length + /// of the array by one (you've been warned). However, in some situations + /// this is not desired so if AddNull==false then the string is copied without + /// null termination. + static Constant *get(const std::string &Initializer, bool AddNull = true); /// getType - Specialize the getType() method to always return an ArrayType, /// which reduces the amount of casting needed in parts of the compiler. diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp index d5f221f5c1f..3351385d0a9 100644 --- a/lib/VMCore/Constants.cpp +++ b/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 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); }