6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-24 22:24:54 +00:00
Code Issues Projects Releases Wiki Activity

When replacing uses and the same node is reached

Browse Source 
via two paths, process it once not twice, d'oh!
Analysis, testcase and original patch thanks to
Mon Ping Wang.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62169 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan Sands
2009-01-13 15:17:14 +00:00
parent 87b8cce21c
commit 2ecf88d175
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
View File

@@ -15,7 +15,7 @@
#include "LegalizeTypes.h"
#include "llvm/CallingConv.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Target/TargetData.h"
using namespace llvm;
@@ -628,13 +628,11 @@ namespace {
class VISIBILITY_HIDDEN NodeUpdateListener :
public SelectionDAG::DAGUpdateListener {
DAGTypeLegalizer &DTL;
SmallVectorImpl<SDNode*> &NodesToAnalyze;
SmallPtrSet<SDNode*, 16> &NodesDeleted;
SmallSetVector<SDNode*, 16> &NodesToAnalyze;
public:
explicit NodeUpdateListener(DAGTypeLegalizer &dtl,
SmallVectorImpl<SDNode*> &nta,
SmallPtrSet<SDNode*, 16> &nd)
: DTL(dtl), NodesToAnalyze(nta), NodesDeleted(nd) {}
SmallSetVector<SDNode*, 16> &nta)
: DTL(dtl), NodesToAnalyze(nta) {}
virtual void NodeDeleted(SDNode *N, SDNode *E) {
assert(N->getNodeId() != DAGTypeLegalizer::ReadyToProcess &&
@@ -647,14 +645,14 @@ namespace {
// In theory the deleted node could also have been scheduled for analysis.
// So add it to the set of nodes which will not be analyzed.
NodesDeleted.insert(N);
NodesToAnalyze.remove(N);
// In general nothing needs to be done for E, since it didn't change but
// only gained new uses. However N -> E was just added to ReplacedValues,
// and the result of a ReplacedValues mapping is not allowed to be marked
// NewNode. So if E is marked NewNode, then it needs to be analyzed.
if (E->getNodeId() == DAGTypeLegalizer::NewNode)
NodesToAnalyze.push_back(E);
NodesToAnalyze.insert(E);
}
virtual void NodeUpdated(SDNode *N) {
@@ -664,7 +662,7 @@ namespace {
assert(N->getNodeId() != DAGTypeLegalizer::ReadyToProcess &&
N->getNodeId() != DAGTypeLegalizer::Processed &&
"Invalid node ID for RAUW deletion!");
NodesToAnalyze.push_back(N);
NodesToAnalyze.insert(N);
}
};
}
@@ -684,9 +682,8 @@ void DAGTypeLegalizer::ReplaceValueWith(SDValue From, SDValue To) {
// Anything that used the old node should now use the new one. Note that this
// can potentially cause recursive merging.
SmallVector<SDNode*, 16> NodesToAnalyze;
SmallPtrSet<SDNode*, 16> NodesDeleted;
NodeUpdateListener NUL(*this, NodesToAnalyze, NodesDeleted);
SmallSetVector<SDNode*, 16> NodesToAnalyze;
NodeUpdateListener NUL(*this, NodesToAnalyze);
DAG.ReplaceAllUsesOfValueWith(From, To, &NUL);
// The old node may still be present in a map like ExpandedIntegers or
@@ -698,10 +695,6 @@ void DAGTypeLegalizer::ReplaceValueWith(SDValue From, SDValue To) {
SDNode *N = NodesToAnalyze.back();
NodesToAnalyze.pop_back();
// Do not analyze deleted nodes!
if (NodesDeleted.count(N))
continue;
// Analyze the node's operands and recalculate the node ID.
assert(N->getNodeId() != DAGTypeLegalizer::ReadyToProcess &&
N->getNodeId() != DAGTypeLegalizer::Processed &&