From ff7fb60f2a7e2f3efd54df6480aadcb4adf5cab7 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 28 Feb 2010 21:53:42 +0000 Subject: enhance the EmitNode/MorphNodeTo operands to take a bit that specifies whether there is an output flag or not. Use this instead of redundantly encoding the chain/flag results in the output vtlist. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97419 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/TableGen/DAGISelMatcherOpt.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'utils/TableGen/DAGISelMatcherOpt.cpp') diff --git a/utils/TableGen/DAGISelMatcherOpt.cpp b/utils/TableGen/DAGISelMatcherOpt.cpp index 65a01fa..01723d3 100644 --- a/utils/TableGen/DAGISelMatcherOpt.cpp +++ b/utils/TableGen/DAGISelMatcherOpt.cpp @@ -92,7 +92,7 @@ static void ContractNodes(OwningPtr &MatcherPtr, // NOTE: Strictly speaking, we don't have to check for the flag here // because the code in the pattern generator doesn't handle it right. We // do it anyway for thoroughness. - if (!EN->hasFlag() && + if (!EN->hasOutFlag() && Pattern.getSrcPattern()->NodeHasProperty(SDNPOutFlag, CGP)) ResultsMatch = false; @@ -110,9 +110,10 @@ static void ContractNodes(OwningPtr &MatcherPtr, const SmallVectorImpl &VTs = EN->getVTList(); const SmallVectorImpl &Operands = EN->getOperandList(); MatcherPtr.reset(new MorphNodeToMatcher(EN->getOpcodeName(), - &VTs[0], VTs.size(), + VTs.data(), VTs.size(), Operands.data(),Operands.size(), - EN->hasChain(), EN->hasFlag(), + EN->hasChain(), EN->hasInFlag(), + EN->hasOutFlag(), EN->hasMemRefs(), EN->getNumFixedArityOperands(), Pattern)); -- cgit v1.1