diff options
| -rw-r--r-- | include/llvm/Constants.h | 2 | ||||
| -rw-r--r-- | lib/VMCore/Constants.cpp | 23 |
2 files changed, 16 insertions, 9 deletions
diff --git a/include/llvm/Constants.h b/include/llvm/Constants.h index d555d3ef17..f0f8146c75 100644 --- a/include/llvm/Constants.h +++ b/include/llvm/Constants.h @@ -345,7 +345,7 @@ protected: public: /// get() - Static factory methods - Return objects of the specified value static Constant *get(const ArrayType *T, const std::vector<Constant*> &); - static Constant *get(const std::string &Initializer); + static Constant *get(const std::string &Initializer, unsigned len = 0); /// 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 d6e524e54e..d5f221f5c1 100644 --- a/lib/VMCore/Constants.cpp +++ b/lib/VMCore/Constants.cpp @@ -924,20 +924,27 @@ void ConstantArray::destroyConstant() { destroyConstantImpl(); } -// ConstantArray::get(const string&) - Return an array that is initialized to -// contain the specified string. A null terminator is added to the specified -// string so that it may be used in a natural way... -// -Constant *ConstantArray::get(const std::string &Str) { +/// ConstantArray::get(const string&) - Return an array that is initialized to +/// contain the specified string. If length is zero then a null terminator is +/// added to the specified string so that it may be used in a natural way. +/// 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"); std::vector<Constant*> ElementVals; - for (unsigned i = 0; i < Str.length(); ++i) + unsigned copy_len = (length == 0 ? Str.length() : length); + for (unsigned i = 0; i < copy_len; ++i) ElementVals.push_back(ConstantSInt::get(Type::SByteTy, Str[i])); // Add a null terminator to the string... - ElementVals.push_back(ConstantSInt::get(Type::SByteTy, 0)); + if (length == 0) { + ElementVals.push_back(ConstantSInt::get(Type::SByteTy, 0)); + copy_len++; + } - ArrayType *ATy = ArrayType::get(Type::SByteTy, Str.length()+1); + ArrayType *ATy = ArrayType::get(Type::SByteTy, copy_len); return ConstantArray::get(ATy, ElementVals); } |