commit 71520a867d5c3d34762cef78c10fe5b54324537e
author Eric Christopher <echristo@apple.com> Mon Jul 11 23:06:52 2011 +0000
committer Eric Christopher <echristo@apple.com> Mon Jul 11 23:06:52 2011 +0000
tree 5bdecbda90b566debd139bbdbcb1ac9ff29c7092
parent 571419bae6765653c47967ba5462c6e06571a49c

Revert r134921, 134917, 134908 and 134907. They're causing failures
in multiple buildbots.

llvm-svn: 134936

llvm/utils/TableGen/AsmMatcherEmitter.cpp

diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
index 3236a19..d9c3b84 100644
--- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
@@ -869,7 +869,7 @@
                                 int SubOpIdx) {
   Record *Rec = OI.Rec;
   if (SubOpIdx != -1)
-    Rec = dynamic_cast<const DefInit*>(OI.MIOperandInfo->getArg(SubOpIdx))->getDef();
+    Rec = dynamic_cast<DefInit*>(OI.MIOperandInfo->getArg(SubOpIdx))->getDef();
 
   if (Rec->isSubClassOf("RegisterOperand")) {
     // RegisterOperand may have an associated ParserMatchClass. If it does,
@@ -879,7 +879,7 @@
       throw "Record `" + Rec->getName() +
         "' does not have a ParserMatchClass!\n";
 
-    if (const DefInit *DI= dynamic_cast<const DefInit*>(R->getValue())) {
+    if (DefInit *DI= dynamic_cast<DefInit*>(R->getValue())) {
       Record *MatchClass = DI->getDef();
       if (ClassInfo *CI = AsmOperandClasses[MatchClass])
         return CI;
@@ -1046,9 +1046,9 @@
     ClassInfo *CI = AsmOperandClasses[*it];
     CI->Kind = ClassInfo::UserClass0 + Index;
 
-    const ListInit *Supers = (*it)->getValueAsListInit("SuperClasses");
+    ListInit *Supers = (*it)->getValueAsListInit("SuperClasses");
     for (unsigned i = 0, e = Supers->getSize(); i != e; ++i) {
-      const DefInit *DI = dynamic_cast<const DefInit*>(Supers->getElement(i));
+      DefInit *DI = dynamic_cast<DefInit*>(Supers->getElement(i));
       if (!DI) {
         PrintError((*it)->getLoc(), "Invalid super class reference!");
         continue;
@@ -1065,28 +1065,28 @@
     CI->ValueName = (*it)->getName();
 
     // Get or construct the predicate method name.
-    const Init *PMName = (*it)->getValueInit("PredicateMethod");
-    if (const StringInit *SI = dynamic_cast<const StringInit*>(PMName)) {
+    Init *PMName = (*it)->getValueInit("PredicateMethod");
+    if (StringInit *SI = dynamic_cast<StringInit*>(PMName)) {
       CI->PredicateMethod = SI->getValue();
     } else {
-      assert(dynamic_cast<const UnsetInit*>(PMName) &&
+      assert(dynamic_cast<UnsetInit*>(PMName) &&
              "Unexpected PredicateMethod field!");
       CI->PredicateMethod = "is" + CI->ClassName;
     }
 
     // Get or construct the render method name.
-    const Init *RMName = (*it)->getValueInit("RenderMethod");
-    if (const StringInit *SI = dynamic_cast<const StringInit*>(RMName)) {
+    Init *RMName = (*it)->getValueInit("RenderMethod");
+    if (StringInit *SI = dynamic_cast<StringInit*>(RMName)) {
       CI->RenderMethod = SI->getValue();
     } else {
-      assert(dynamic_cast<const UnsetInit*>(RMName) &&
+      assert(dynamic_cast<UnsetInit*>(RMName) &&
              "Unexpected RenderMethod field!");
       CI->RenderMethod = "add" + CI->ClassName + "Operands";
     }
 
     // Get the parse method name or leave it as empty.
-    const Init *PRMName = (*it)->getValueInit("ParserMethod");
-    if (const StringInit *SI = dynamic_cast<const StringInit*>(PRMName))
+    Init *PRMName = (*it)->getValueInit("ParserMethod");
+    if (StringInit *SI = dynamic_cast<StringInit*>(PRMName))
       CI->ParserMethod = SI->getValue();
 
     AsmOperandClasses[*it] = CI;