fixup! Assign ResDef if ALiasDef is non-null

Author: michaelmaitland

llvm/utils/TableGen/SubtargetEmitter.cpp

@@ -902,21 +902,19 @@ SubtargetEmitter::FindWriteResources(const CodeGenSchedRW &SchedWrite,
   for (Record *WR : ProcModel.WriteResDefs) {
     if (!WR->isSubClassOf("WriteRes"))
       continue;
-    // If there is no AliasDef and we find a match, we can early exit since
-    // there is no need to verify whether there are resources defined for both
-    // SchedWrite and its alias.
     Record *WRDef = WR->getValueAsDef("WriteType");
-    if (!AliasDef && SchedWrite.TheDef == WRDef) {
-      ResDef = WR;
-      break;
-    }
-    if (AliasDef == WRDef) {
+    if (AliasDef == WRDef || SchedWrite.TheDef == WRDef) {
       if (ResDef) {
         PrintFatalError(WR->getLoc(), "Resources are defined for both "
                                       "SchedWrite and its alias on processor " +
                                           ProcModel.ModelName);
       }
       ResDef = WR;
+      // If there is no AliasDef and we find a match, we can early exit since
+      // there is no need to verify whether there are resources defined for both
+      // SchedWrite and its alias.
+      if (!AliasDef)
+        break;
     }
   }
   // TODO: If ProcModel has a base model (previous generation processor),
@@ -963,21 +961,19 @@ Record *SubtargetEmitter::FindReadAdvance(const CodeGenSchedRW &SchedRead,
   for (Record *RA : ProcModel.ReadAdvanceDefs) {
     if (!RA->isSubClassOf("ReadAdvance"))
       continue;
-    // If there is no AliasDef and we find a match, we can early exit since
-    // there is no need to verify whether there are resources defined for both
-    // SchedRead and its alias.
     Record *RADef = RA->getValueAsDef("ReadType");
-    if (!AliasDef && SchedRead.TheDef == RADef) {
-      ResDef = RA;
-      break;
-    }
-    if (AliasDef == RADef) {
+    if (AliasDef == RADef || SchedRead.TheDef == RADef) {
       if (ResDef) {
         PrintFatalError(RA->getLoc(), "Resources are defined for both "
                                       "SchedRead and its alias on processor " +
                                           ProcModel.ModelName);
       }
       ResDef = RA;
+      // If there is no AliasDef and we find a match, we can early exit since
+      // there is no need to verify whether there are resources defined for both
+      // SchedRead and its alias.
+      if (!AliasDef)
+        break;
     }
   }
   // TODO: If ProcModel has a base model (previous generation processor),