[llvm-commits] [llvm] r131134 - /llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Tue May 10 12:52:59 2011
New Revision: 131134

URL: http://llvm.org/viewvc/llvm-project?rev=131134&view=rev
Log:
Downgrade a tablegen warning to an error.

Ambiguous sub-register index compositions are OK as long as the backend writer
knows what he is doing.

Modified:
    llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp

Modified: llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp?rev=131134&r1=131133&r2=131134&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp Tue May 10 12:52:59 2011
@@ -293,14 +293,13 @@
           if (i1d->second == Reg3) {
             std::pair<CompositeMap::iterator,bool> Ins =
               Composite.insert(std::make_pair(IdxPair, i1d->first));
-            // Conflicting composition?
+            // Conflicting composition? Emit a warning but allow it.
             if (!Ins.second && Ins.first->second != i1d->first) {
-              errs() << "Error: SubRegIndex " << getQualifiedName(Idx1)
+              errs() << "Warning: SubRegIndex " << getQualifiedName(Idx1)
                      << " and " << getQualifiedName(IdxPair.second)
                      << " compose ambiguously as "
                      << getQualifiedName(Ins.first->second) << " or "
                      << getQualifiedName(i1d->first) << "\n";
-              abort();
             }
           }
         }