commit b3bd019cd797e02848a087a6036dd009ff411a55
author Benjamin Kramer <benny.kra@googlemail.com> Tue Dec 06 11:50:26 2011 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Tue Dec 06 11:50:26 2011 +0000
tree e04878c9a84f207e6cb3b466f5a288c8b9048211
parent 3f8073aaefc2d53e664d4f3bd58214662e6c95e9

Push StringRefs through the metadata interface.

llvm-svn: 145934

llvm/lib/AsmParser/LLParser.cpp

diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index 1ef6910..4678269 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -1064,7 +1064,7 @@
       return TokError("expected metadata after comma");
 
     std::string Name = Lex.getStrVal();
-    unsigned MDK = M->getMDKindID(Name.c_str());
+    unsigned MDK = M->getMDKindID(Name);
     Lex.Lex();
 
     MDNode *Node;

llvm/lib/Transforms/Scalar/LICM.cpp

diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp
index 54a3da8..65d8c6b 100644
--- a/llvm/lib/Transforms/Scalar/LICM.cpp
+++ b/llvm/lib/Transforms/Scalar/LICM.cpp
@@ -379,7 +379,7 @@
     // in the same alias set as something that ends up being modified.
     if (AA->pointsToConstantMemory(LI->getOperand(0)))
       return true;
-    if (LI->getMetadata(LI->getContext().getMDKindID("invariant.load")))
+    if (LI->getMetadata("invariant.load"))
       return true;
 
     // Don't hoist loads which have may-aliased stores in loop.

llvm/lib/VMCore/Metadata.cpp

diff --git a/llvm/lib/VMCore/Metadata.cpp b/llvm/lib/VMCore/Metadata.cpp
index ace4dc2..8debd7c 100644
--- a/llvm/lib/VMCore/Metadata.cpp
+++ b/llvm/lib/VMCore/Metadata.cpp
@@ -425,12 +425,12 @@
 // Instruction Metadata method implementations.
 //
 
-void Instruction::setMetadata(const char *Kind, MDNode *Node) {
+void Instruction::setMetadata(StringRef Kind, MDNode *Node) {
   if (Node == 0 && !hasMetadata()) return;
   setMetadata(getContext().getMDKindID(Kind), Node);
 }
 
-MDNode *Instruction::getMetadataImpl(const char *Kind) const {
+MDNode *Instruction::getMetadataImpl(StringRef Kind) const {
   return getMetadataImpl(getContext().getMDKindID(Kind));
 }