commit 4acd57eb511b3ac7c19638d8c82e54d7d3e02cfc
author Sander de Smalen <sander.desmalen@arm.com> Tue Nov 21 15:07:43 2017 +0000
committer Sander de Smalen <sander.desmalen@arm.com> Tue Nov 21 15:07:43 2017 +0000
tree 30330e6e68b8854d79677e7e5083ff031c08e406
parent 4609b25dde7dd13e04aed3c9d1bcf389be5e80d0

Revert r318759 due to make check-all failure on Windows

llvm-svn: 318768

llvm/utils/TableGen/AsmMatcherEmitter.cpp

diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
index 4761cfc2..d279e8c 100644
--- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
@@ -3397,9 +3397,10 @@
     OS << "      // target predicate, that diagnostic is preferred.\n";
     OS << "      if (!HadMatchOtherThanPredicate &&\n";
     OS << "          (it == MnemonicRange.first || ErrorInfo <= ActualIdx)) {\n";
-    OS << "        if (Diag != Match_InvalidOperand || ErrorInfo != ActualIdx)\n";
-    OS << "          RetCode = Diag;\n";
     OS << "        ErrorInfo = ActualIdx;\n";
+    OS << "        // InvalidOperand is the default. Prefer specificity.\n";
+    OS << "        if (Diag != Match_InvalidOperand)\n";
+    OS << "          RetCode = Diag;\n";
     OS << "      }\n";
     OS << "      // Otherwise, just reject this instance of the mnemonic.\n";
     OS << "      OperandsValid = false;\n";