Reviewers: Benedikt Meurer,
Description:
Fix Node::ReplaceUses to handle unused nodes.
[email protected]
TEST=cctest/test-node/NodeUseIteratorReplaceNoUses
Please review this at https://codereview.chromium.org/521643002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+10, -4 lines):
M src/compiler/generic-node-inl.h
M test/cctest/compiler/test-node.cc
Index: src/compiler/generic-node-inl.h
diff --git a/src/compiler/generic-node-inl.h
b/src/compiler/generic-node-inl.h
index
e7a8f90f61b0726036df1caddbc23492ff21e9b3..82fd907c16e18811c00b8bf2c2ab3e4d9a5b2903
100644
--- a/src/compiler/generic-node-inl.h
+++ b/src/compiler/generic-node-inl.h
@@ -64,12 +64,13 @@ void GenericNode<B, S>::ReplaceUses(GenericNode*
replace_to) {
if (replace_to->last_use_ == NULL) {
DCHECK_EQ(NULL, replace_to->first_use_);
replace_to->first_use_ = first_use_;
- } else {
+ replace_to->last_use_ = last_use_;
+ } else if (first_use_ != NULL) {
DCHECK_NE(NULL, replace_to->first_use_);
replace_to->last_use_->next = first_use_;
first_use_->prev = replace_to->last_use_;
+ replace_to->last_use_ = last_use_;
}
- replace_to->last_use_ = last_use_;
replace_to->use_count_ += use_count_;
use_count_ = 0;
first_use_ = NULL;
Index: test/cctest/compiler/test-node.cc
diff --git a/test/cctest/compiler/test-node.cc
b/test/cctest/compiler/test-node.cc
index
6fe8573a2f78b3218ab51bc0b3cfcd47f9dd3e1a..da10d250f92457974403b2955d26cd49abdfd89d
100644
--- a/test/cctest/compiler/test-node.cc
+++ b/test/cctest/compiler/test-node.cc
@@ -118,9 +118,14 @@ TEST(NodeUseIteratorOne) {
TEST(NodeUseIteratorReplaceNoUses) {
GraphTester graph;
Node* n0 = graph.NewNode(&dummy_operator);
- Node* n3 = graph.NewNode(&dummy_operator);
- n0->ReplaceUses(n3);
+ Node* n1 = graph.NewNode(&dummy_operator);
+ Node* n2 = graph.NewNode(&dummy_operator);
+ Node* n3 = graph.NewNode(&dummy_operator, n2);
+ n0->ReplaceUses(n1);
+ CHECK(n0->uses().begin() == n0->uses().end());
+ n0->ReplaceUses(n2);
CHECK(n0->uses().begin() == n0->uses().end());
+ USE(n3);
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
