7 files changed, 15 insertions, 14 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index b09f23fbd1a..94224a6361c 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -373,7 +373,7 @@ bool LLParser::ParseNamedGlobal() {
 bool LLParser::ParseMDString(MetadataBase *&MDS) {
   std::string Str;
   if (ParseStringConstant(Str)) return true;
-  MDS = Context.getMDString(Str.data(), Str.data() + Str.size());
+  MDS = Context.getMDString(Str.data(), Str.size());
   return false;
 }
 
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 8393cd42163..01b3eb3bced 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -758,7 +758,7 @@ bool BitcodeReader::ParseMetadata() {
       for (unsigned i = 0; i != MDStringLength; ++i)
         String[i] = Record[i];
       Value *V = 
-        Context.getMDString(String.c_str(), String.c_str() + MDStringLength);
+        Context.getMDString(String.c_str(), MDStringLength);
       ValueList.AssignValue(V, NextValueNo++);
       break;
     }
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
index 7d745ffd50d..b3124204903 100644
--- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -512,7 +512,7 @@ static uint64_t GetOptimizationFlags(const Value *V) {
 
        // Code: [strchar x N]
        const char *StrBegin = MDS->begin();
-       for (unsigned i = 0, e = MDS->size(); i != e; ++i)
+       for (unsigned i = 0, e = MDS->length(); i != e; ++i)
         Record.push_back(StrBegin[i]);
     
        // Emit the finished record.
diff --git a/llvm/lib/VMCore/AsmWriter.cpp b/llvm/lib/VMCore/AsmWriter.cpp
index ae55d5ba515..73310a35545 100644
--- a/llvm/lib/VMCore/AsmWriter.cpp
+++ b/llvm/lib/VMCore/AsmWriter.cpp
@@ -1139,7 +1139,7 @@ static void WriteAsOperandInternal(raw_ostream &Out, const Value *V,
 
   if (const MDString *MDS = dyn_cast<MDString>(V)) {
     Out << "!\"";
-    PrintEscapedString(MDS->begin(), MDS->size(), Out);
+    PrintEscapedString(MDS->begin(), MDS->length(), Out);
     Out << '"';
     return;
   }
@@ -1983,7 +1983,7 @@ void Value::print(raw_ostream &OS, AssemblyAnnotationWriter *AAW) const {
     TypePrinter.print(MDS->getType(), OS);
     OS << ' ';
     OS << "!\"";
-    PrintEscapedString(MDS->begin(), MDS->size(), OS);
+    PrintEscapedString(MDS->begin(), MDS->length(), OS);
     OS << '"';
   } else if (const MDNode *N = dyn_cast<MDNode>(this)) {
     SlotTracker SlotTable(N);
diff --git a/llvm/lib/VMCore/LLVMContext.cpp b/llvm/lib/VMCore/LLVMContext.cpp
index c88ecba72bf..d0abb2df626 100644
--- a/llvm/lib/VMCore/LLVMContext.cpp
+++ b/llvm/lib/VMCore/LLVMContext.cpp
@@ -551,12 +551,12 @@ MDNode* LLVMContext::getMDNode(Value* const* Vals, unsigned NumVals) {
 }
 
 // MDString accessors
-MDString* LLVMContext::getMDString(const char *StrBegin, const char *StrEnd) {
-  return pImpl->getMDString(StrBegin, StrEnd);
+MDString* LLVMContext::getMDString(const char *StrBegin, unsigned StrLength) {
+  return pImpl->getMDString(StrBegin, StrLength);
 }
 
 MDString* LLVMContext::getMDString(const std::string &Str) {
-  return getMDString(Str.data(), Str.data()+Str.size());
+  return getMDString(Str.data(), Str.size());
 }
 
 // FunctionType accessors
diff --git a/llvm/lib/VMCore/LLVMContextImpl.cpp b/llvm/lib/VMCore/LLVMContextImpl.cpp
index 8ad46a040c5..79b33c14581 100644
--- a/llvm/lib/VMCore/LLVMContextImpl.cpp
+++ b/llvm/lib/VMCore/LLVMContextImpl.cpp
@@ -394,13 +394,13 @@ ConstantFP *LLVMContextImpl::getConstantFP(const APFloat &V) {
 }
 
 MDString *LLVMContextImpl::getMDString(const char *StrBegin,
-                                       const char *StrEnd) {
+                                       unsigned StrLength) {
   sys::SmartScopedWriter<true> Writer(ConstantsLock);
-  StringMapEntry<MDString *> &Entry = MDStringCache.GetOrCreateValue(
-                                        StrBegin, StrEnd);
+  StringMapEntry<MDString *> &Entry = 
+    MDStringCache.GetOrCreateValue(StrBegin, StrBegin + StrLength);
   MDString *&S = Entry.getValue();
   if (!S) S = new MDString(Entry.getKeyData(),
-                           Entry.getKeyData() + Entry.getKeyLength());
+                           Entry.getKeyLength());
 
   return S;
 }
@@ -460,7 +460,8 @@ Constant *LLVMContextImpl::getConstantArray(const ArrayType *Ty,
 
 void LLVMContextImpl::erase(MDString *M) {
   sys::SmartScopedWriter<true> Writer(ConstantsLock);
-  MDStringCache.erase(MDStringCache.find(M->StrBegin, M->StrEnd));
+  MDStringCache.erase(MDStringCache.find(M->StrBegin, 
+                                         M->StrBegin + M->length()));
 }
 
 void LLVMContextImpl::erase(MDNode *M) {
diff --git a/llvm/lib/VMCore/LLVMContextImpl.h b/llvm/lib/VMCore/LLVMContextImpl.h
index 03f0e7b1414..392e500f128 100644
--- a/llvm/lib/VMCore/LLVMContextImpl.h
+++ b/llvm/lib/VMCore/LLVMContextImpl.h
@@ -133,7 +133,7 @@ public:
   
   ConstantFP *getConstantFP(const APFloat &V);
   
-  MDString *getMDString(const char *StrBegin, const char *StrEnd);
+  MDString *getMDString(const char *StrBegin, unsigned StrLength);
   
   MDNode *getMDNode(Value*const* Vals, unsigned NumVals);