From ccd23cc2a49f02acbcdd50128a9022477f7cb6a4 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 28 Feb 2010 23:00:47 +0000 Subject: [PATCH] simplify some code now that chain/flag results are not stored in the vtlist for emitnode. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97429 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/TableGen/DAGISelMatcher.h | 9 --------- utils/TableGen/DAGISelMatcherEmitter.cpp | 2 +- utils/TableGen/DAGISelMatcherOpt.cpp | 6 +++--- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/utils/TableGen/DAGISelMatcher.h b/utils/TableGen/DAGISelMatcher.h index d9c8b292212..ea48a0b51e6 100644 --- a/utils/TableGen/DAGISelMatcher.h +++ b/utils/TableGen/DAGISelMatcher.h @@ -902,15 +902,6 @@ public: return VTs[i]; } - /// getNumNonChainFlagVTs - Return the number of normal results that this node - /// will have, ignoring flag and chain results. - unsigned getNumNonChainFlagVTs() const { - for (unsigned i = 0, e = getNumVTs(); i != e; ++i) - if (VTs[i] == MVT::Flag || VTs[i] == MVT::Other) - return i; - return getNumVTs(); - } - unsigned getNumOperands() const { return Operands.size(); } unsigned getOperand(unsigned i) const { assert(i < Operands.size()); diff --git a/utils/TableGen/DAGISelMatcherEmitter.cpp b/utils/TableGen/DAGISelMatcherEmitter.cpp index 76241c5193e..3f78cdd206b 100644 --- a/utils/TableGen/DAGISelMatcherEmitter.cpp +++ b/utils/TableGen/DAGISelMatcherEmitter.cpp @@ -372,7 +372,7 @@ EmitMatcher(const Matcher *N, unsigned Indent, unsigned CurrentIdx, // Print the result #'s for EmitNode. if (const EmitNodeMatcher *E = dyn_cast(EN)) { - if (unsigned NumResults = EN->getNumNonChainFlagVTs()) { + if (unsigned NumResults = EN->getNumVTs()) { OS.PadToColumn(CommentIndent) << "// Results = "; unsigned First = E->getFirstResultSlot(); for (unsigned i = 0; i != NumResults; ++i) diff --git a/utils/TableGen/DAGISelMatcherOpt.cpp b/utils/TableGen/DAGISelMatcherOpt.cpp index 01723d3ec84..37643c31840 100644 --- a/utils/TableGen/DAGISelMatcherOpt.cpp +++ b/utils/TableGen/DAGISelMatcherOpt.cpp @@ -65,7 +65,9 @@ static void ContractNodes(OwningPtr &MatcherPtr, MatcherPtr.reset(MP->takeNext()); return ContractNodes(MatcherPtr, CGP); } - + + // FIXME: Handle OPC_MarkFlagResults. + // Turn EmitNode->CompleteMatch into MorphNodeTo if we can. if (EmitNodeMatcher *EN = dyn_cast(N)) if (CompleteMatchMatcher *CM = @@ -120,8 +122,6 @@ static void ContractNodes(OwningPtr &MatcherPtr, return; } - // FIXME: Handle OPC_MarkFlagResults. - // FIXME2: Kill off all the SelectionDAG::MorphNodeTo and getMachineNode // variants. }