diff --git a/support/tools/TableGen/FileParser.y b/support/tools/TableGen/FileParser.y
index ff3ec40484c..76f07e465f8 100644
--- a/support/tools/TableGen/FileParser.y
+++ b/support/tools/TableGen/FileParser.y
@@ -92,8 +92,8 @@ static void setValue(const std::string &ValName,
     // Loop over bits, assigning values as appropriate...
     for (unsigned i = 0, e = BitList->size(); i != e; ++i) {
       unsigned Bit = (*BitList)[i];
-      if (NewVal->getBit(i)) {
-        err() << "Cannot set bit #" << i << " of value '" << ValName
+      if (NewVal->getBit(Bit)) {
+        err() << "Cannot set bit #" << Bit << " of value '" << ValName
               << "' more than once!\n";
         abort();
       }
diff --git a/utils/TableGen/FileParser.y b/utils/TableGen/FileParser.y
index ff3ec40484c..76f07e465f8 100644
--- a/utils/TableGen/FileParser.y
+++ b/utils/TableGen/FileParser.y
@@ -92,8 +92,8 @@ static void setValue(const std::string &ValName,
     // Loop over bits, assigning values as appropriate...
     for (unsigned i = 0, e = BitList->size(); i != e; ++i) {
       unsigned Bit = (*BitList)[i];
-      if (NewVal->getBit(i)) {
-        err() << "Cannot set bit #" << i << " of value '" << ValName
+      if (NewVal->getBit(Bit)) {
+        err() << "Cannot set bit #" << Bit << " of value '" << ValName
               << "' more than once!\n";
         abort();
       }