simplify
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118326 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/AsmMatcherEmitter.cpp b/utils/TableGen/AsmMatcherEmitter.cpp
index 404cc23..093c46f 100644
--- a/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/utils/TableGen/AsmMatcherEmitter.cpp
@@ -306,9 +306,6 @@
}
};
- /// ResultInst - The result instruction generated.
- const CodeGenInstruction *ResultInst;
-
/// TheDef - This is the definition of the instruction or InstAlias that this
/// matchable came from.
Record *const TheDef;
@@ -349,13 +346,11 @@
MatchableInfo(const CodeGenInstruction &CGI)
: TheDef(CGI.TheDef), DefRec(&CGI),
TheOperandList(CGI.Operands), AsmString(CGI.AsmString) {
- ResultInst = &CGI;
}
MatchableInfo(const CodeGenInstAlias *Alias)
: TheDef(Alias->TheDef), DefRec(Alias), TheOperandList(Alias->Operands),
AsmString(Alias->AsmString) {
- ResultInst = Alias->ResultInst;
}
void Initialize(const AsmMatcherInfo &Info,
@@ -1821,7 +1816,14 @@
it != ie; ++it) {
MatchableInfo &II = **it;
- OS << " { " << Target.getName() << "::" << II.ResultInst->TheDef->getName()
+
+ const CodeGenInstruction *ResultInst;
+ if (II.DefRec.is<const CodeGenInstruction*>())
+ ResultInst = II.DefRec.get<const CodeGenInstruction*>();
+ else
+ ResultInst = II.DefRec.get<const CodeGenInstAlias*>()->ResultInst;
+
+ OS << " { " << Target.getName() << "::" << ResultInst->TheDef->getName()
<< ", \"" << II.Mnemonic << "\""
<< ", " << II.ConversionFnKind << ", { ";
for (unsigned i = 0, e = II.AsmOperands.size(); i != e; ++i) {