Revision: 23519
Author: [email protected]
Date: Fri Aug 29 12:14:52 2014 UTC
Log: Fix Node::ReplaceUses to handle unused nodes.
[email protected]
TEST=cctest/test-node/NodeUseIteratorReplaceNoUses
Review URL: https://codereview.chromium.org/521643002
https://code.google.com/p/v8/source/detail?r=23519
Modified:
/branches/bleeding_edge/src/compiler/generic-node-inl.h
/branches/bleeding_edge/test/cctest/compiler/test-node.cc
=======================================
--- /branches/bleeding_edge/src/compiler/generic-node-inl.h Tue Aug 26
13:09:08 2014 UTC
+++ /branches/bleeding_edge/src/compiler/generic-node-inl.h Fri Aug 29
12:14:52 2014 UTC
@@ -64,12 +64,13 @@
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;
=======================================
--- /branches/bleeding_edge/test/cctest/compiler/test-node.cc Thu Jul 31
16:22:27 2014 UTC
+++ /branches/bleeding_edge/test/cctest/compiler/test-node.cc Fri Aug 29
12:14:52 2014 UTC
@@ -118,9 +118,14 @@
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.
