summaryrefslogtreecommitdiffstats
path: root/llvm/utils
diff options
context:
space:
mode:
authorSander de Smalen <sander.desmalen@arm.com>2017-11-21 15:07:43 +0000
committerSander de Smalen <sander.desmalen@arm.com>2017-11-21 15:07:43 +0000
commit4acd57eb511b3ac7c19638d8c82e54d7d3e02cfc (patch)
tree30330e6e68b8854d79677e7e5083ff031c08e406 /llvm/utils
parent4609b25dde7dd13e04aed3c9d1bcf389be5e80d0 (diff)
downloadbcm5719-llvm-4acd57eb511b3ac7c19638d8c82e54d7d3e02cfc.tar.gz
bcm5719-llvm-4acd57eb511b3ac7c19638d8c82e54d7d3e02cfc.zip
Revert r318759 due to make check-all failure on Windows
llvm-svn: 318768
Diffstat (limited to 'llvm/utils')
-rw-r--r--llvm/utils/TableGen/AsmMatcherEmitter.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
index 4761cfc23a3..d279e8c3ae9 100644
--- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
@@ -3397,9 +3397,10 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
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";
OpenPOWER on IntegriCloud