diff options
author | Chris Lattner <sabre@nondot.org> | 2005-12-19 22:21:21 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2005-12-19 22:21:21 +0000 |
commit | 50b2d302d5684d2ed0e37e55519bd0f5f3d1b560 (patch) | |
tree | 16d98c7426f9b05b496f704bb5c234491c0bd2fc /llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | |
parent | 7671a5b8448a7364299d2631b7f183d58cfbf841 (diff) | |
download | bcm5719-llvm-50b2d302d5684d2ed0e37e55519bd0f5f3d1b560.tar.gz bcm5719-llvm-50b2d302d5684d2ed0e37e55519bd0f5f3d1b560.zip |
Fix a case where the DAG Combiner would accidentally CSE flag-producing nodes,
creating graphs that cannot be scheduled.
llvm-svn: 24866
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp')
-rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 2fe1b0df0de..86ad89e958d 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -389,9 +389,14 @@ SDNode *SelectionDAG::AddNonLeafNodeToCSEMaps(SDNode *N) { assert(N->getNumOperands() && "This is a leaf node!"); if (N->getOpcode() == ISD::CALLSEQ_START || N->getOpcode() == ISD::CALLSEQ_END || - N->getOpcode() == ISD::HANDLENODE) + N->getOpcode() == ISD::HANDLENODE || N->getValueType(0) == MVT::Flag) return 0; // Never add these nodes. + // Check that remaining values produced are not flags. + for (unsigned i = 1, e = N->getNumValues(); i != e; ++i) + if (N->getValueType(i) == MVT::Flag) + return 0; // Never CSE anything that produces a flag. + if (N->getNumValues() == 1) { if (N->getNumOperands() == 1) { SDNode *&U = UnaryOps[std::make_pair(N->getOpcode(), |