[llvm-commits] [llvm] r75057 - in /llvm/trunk: lib/AsmParser/LLParser.cpp lib/VMCore/AsmWriter.cpp test/Feature/mdnode2.ll test/Feature/mdnode3.ll test/Feature/mdnode4.ll unittests/VMCore/MetadataTest.cpp

[Devang Patel]

Author: dpatel
Date: Wed Jul  8 16:57:07 2009
New Revision: 75057

URL: http://llvm.org/viewvc/llvm-project?rev=75057&view=rev
Log:
Drop "constant" from 
  !0 = constant metadata !{...}

Modified:
    llvm/trunk/lib/AsmParser/LLParser.cpp
    llvm/trunk/lib/VMCore/AsmWriter.cpp
    llvm/trunk/test/Feature/mdnode2.ll
    llvm/trunk/test/Feature/mdnode3.ll
    llvm/trunk/test/Feature/mdnode4.ll
    llvm/trunk/unittests/VMCore/MetadataTest.cpp

Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=75057&r1=75056&r2=75057&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Wed Jul  8 16:57:07 2009
@@ -377,10 +377,8 @@
     return true;
 
   LocTy TyLoc;
-  bool IsConstant;    
   PATypeHolder Ty(Type::VoidTy);
-  if (ParseGlobalType(IsConstant) ||
-      ParseType(Ty, TyLoc))
+  if (ParseType(Ty, TyLoc))
     return true;
   
   Constant *Init = 0;

Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=75057&r1=75056&r2=75057&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
+++ llvm/trunk/lib/VMCore/AsmWriter.cpp Wed Jul  8 16:57:07 2009
@@ -827,7 +827,7 @@
     Nodes[I->second] = cast<MDNode>(I->first);
 
   for (unsigned i = 0, e = Nodes.size(); i != e; ++i) {
-    Out << '!' << i << " = constant metadata ";
+    Out << '!' << i << " = metadata ";
     const MDNode *Node = Nodes[i];
     Out << "!{";
     for (MDNode::const_elem_iterator NI = Node->elem_begin(), 

Modified: llvm/trunk/test/Feature/mdnode2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/mdnode2.ll?rev=75057&r1=75056&r2=75057&view=diff

==============================================================================
--- llvm/trunk/test/Feature/mdnode2.ll (original)
+++ llvm/trunk/test/Feature/mdnode2.ll Wed Jul  8 16:57:07 2009
@@ -3,6 +3,6 @@
 ; RUN: grep "metadata !{i32 21, i32 22}" %t.ll
 ; RUN: grep "metadata !{i32 23, i32 24}" %t.ll
 
-!0 = constant metadata !{i32 21, i32 22}
-!1 = constant metadata !{i32 23, i32 24}
+!0 = metadata !{i32 21, i32 22}
+!1 = metadata !{i32 23, i32 24}
 @llvm.blah = constant metadata !{i32 1000, i16 200, metadata !1, metadata !0}

Modified: llvm/trunk/test/Feature/mdnode3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/mdnode3.ll?rev=75057&r1=75056&r2=75057&view=diff

==============================================================================
--- llvm/trunk/test/Feature/mdnode3.ll (original)
+++ llvm/trunk/test/Feature/mdnode3.ll Wed Jul  8 16:57:07 2009
@@ -1,3 +1,3 @@
 ; RUN: llvm-as < %s | llvm-dis | llvm-as -f -o /dev/null
-!0 = constant metadata !{i32 21, i32 22}
+!0 = metadata !{i32 21, i32 22}
 @llvm.blah = constant metadata !{i32 1000, i16 200, metadata !0, metadata !0}

Modified: llvm/trunk/test/Feature/mdnode4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/mdnode4.ll?rev=75057&r1=75056&r2=75057&view=diff

==============================================================================
--- llvm/trunk/test/Feature/mdnode4.ll (original)
+++ llvm/trunk/test/Feature/mdnode4.ll Wed Jul  8 16:57:07 2009
@@ -2,4 +2,5 @@
 ; RUN: llvm-as < %s | llvm-dis -f -o /dev/null
 
 @llvm.blah = constant metadata !{metadata !1}
-!1 = constant metadata !{i32 23, i32 24}
+!1 = metadata !{i32 23, i32 24}
+

Modified: llvm/trunk/unittests/VMCore/MetadataTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/VMCore/MetadataTest.cpp?rev=75057&r1=75056&r2=75057&view=diff

==============================================================================
--- llvm/trunk/unittests/VMCore/MetadataTest.cpp (original)
+++ llvm/trunk/unittests/VMCore/MetadataTest.cpp Wed Jul  8 16:57:07 2009
@@ -94,10 +94,10 @@
   std::ostringstream oss1, oss2;
   n1->print(oss1);
   n2->print(oss2);
-  EXPECT_STREQ("!0 = constant metadata !{metadata !\"abc\", i8 0, metadata !\"123\"}\n",
+  EXPECT_STREQ("!0 = metadata !{metadata !\"abc\", i8 0, metadata !\"123\"}\n",
                oss1.str().c_str());
-  EXPECT_STREQ("!0 = constant metadata !{metadata !1}\n"
-               "!1 = constant metadata !{metadata !\"abc\", i8 0, metadata !\"123\"}\n",
+  EXPECT_STREQ("!0 = metadata !{metadata !1}\n"
+               "!1 = metadata !{metadata !\"abc\", i8 0, metadata !\"123\"}\n",
                oss2.str().c_str());
 }
 
@@ -134,6 +134,6 @@
 
   std::ostringstream oss;
   wvh->print(oss);
-  EXPECT_STREQ("!0 = constant metadata !{null}\n", oss.str().c_str());
+  EXPECT_STREQ("!0 = metadata !{null}\n", oss.str().c_str());
 }
 }