2 files changed, 6 insertions, 10 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index 2a2192c2a57..8b3b832cb69 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -440,8 +440,7 @@ bool LLParser::ParseNamedMetadata() {
   if (ParseToken(lltok::rbrace, "expected end of metadata node"))
     return true;
 
-  NamedMDNode::Create(Name.c_str(), Name.length(),
-                      Elts.data(), Elts.size(), M);
+  NamedMDNode::Create(Name, Elts.data(), Elts.size(), M);
   return false;
 }
 
diff --git a/llvm/lib/VMCore/Metadata.cpp b/llvm/lib/VMCore/Metadata.cpp
index 2f6c153a9d7..cb1dd6553a9 100644
--- a/llvm/lib/VMCore/Metadata.cpp
+++ b/llvm/lib/VMCore/Metadata.cpp
@@ -33,15 +33,12 @@ void MDNode::Profile(FoldingSetNodeID &ID) const {
 //===----------------------------------------------------------------------===//
 //NamedMDNode implementation
 //
-NamedMDNode::NamedMDNode(const char *N, unsigned NameLength,
-                         MetadataBase*const* MDs, unsigned NumMDs,
-                         Module *M)
-  : MetadataBase(Type::MetadataTy, Value::NamedMDNodeVal),
-    Name(N, NameLength) {
+NamedMDNode::NamedMDNode(const Twine &N, MetadataBase*const* MDs, 
+                         unsigned NumMDs, Module *ParentModule)
+  : MetadataBase(Type::MetadataTy, Value::NamedMDNodeVal) {
   setName(N);
   for (unsigned i = 0; i != NumMDs; ++i)
     Node.push_back(WeakMetadataVH(MDs[i]));
-
-  if (M)
-    M->getNamedMDList().push_back(this);
+  if (ParentModule)
+    ParentModule->getNamedMDList().push_back(this);
 }