[PATCH] D83588: [TableGen][CGS] Print better errors on overlapping InstRW

[Jon Roelofs via Phabricator via llvm-commits]

jroelofs created this revision.
jroelofs added reviewers: thakis, evandro, dsanders.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D83588

Files:
  llvm/utils/TableGen/CodeGenSchedule.cpp


Index: llvm/utils/TableGen/CodeGenSchedule.cpp
===================================================================
--- llvm/utils/TableGen/CodeGenSchedule.cpp
+++ llvm/utils/TableGen/CodeGenSchedule.cpp
@@ -1083,13 +1083,14 @@
             if (RWD->getValueAsDef("SchedModel") == RWModelDef &&
                 RWModelDef->getValueAsBit("FullInstRWOverlapCheck")) {
               assert(!InstDefs.empty()); // Checked at function start.
-              PrintFatalError
+              PrintError
                   (InstRWDef->getLoc(),
                    "Overlapping InstRW definition for \"" +
                    InstDefs.front()->getName() +
                    "\" also matches previous \"" +
                    RWD->getValue("Instrs")->getValue()->getAsString() +
                    "\".");
+              PrintFatalError(RWD->getLoc(), "Previous match was here.");
             }
           }
           LLVM_DEBUG(dbgs() << "InstRW: Reuse SC " << OldSCIdx << ":"
@@ -1118,13 +1119,14 @@
       for (Record *OldRWDef : SchedClasses[OldSCIdx].InstRWs) {
         if (OldRWDef->getValueAsDef("SchedModel") == RWModelDef) {
           assert(!InstDefs.empty()); // Checked at function start.
-          PrintFatalError
+          PrintError
               (InstRWDef->getLoc(),
                "Overlapping InstRW definition for \"" +
                InstDefs.front()->getName() +
                "\" also matches previous \"" +
                OldRWDef->getValue("Instrs")->getValue()->getAsString() +
                "\".");
+          PrintFatalError(OldRWDef->getLoc(), "Previous match was here.");
         }
         assert(OldRWDef != InstRWDef &&
                "SchedClass has duplicate InstRW def");


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D83588.277141.patch
Type: text/x-patch
Size: 1718 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200710/bb20bcf2/attachment.bin>