From e019dc741496c7d519b15cb8e24eac908abc09c6 Mon Sep 17 00:00:00 2001 From: "mstarzinger@chromium.org" Date: Fri, 29 Aug 2014 12:14:52 +0000 Subject: [PATCH] Fix Node::ReplaceUses to handle unused nodes. R=bmeurer@chromium.org TEST=cctest/test-node/NodeUseIteratorReplaceNoUses Review URL: https://codereview.chromium.org/521643002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23519 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/compiler/generic-node-inl.h | 5 +++-- test/cctest/compiler/test-node.cc | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/compiler/generic-node-inl.h b/src/compiler/generic-node-inl.h index e7a8f90..82fd907 100644 --- a/src/compiler/generic-node-inl.h +++ b/src/compiler/generic-node-inl.h @@ -64,12 +64,13 @@ void GenericNode::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; diff --git a/test/cctest/compiler/test-node.cc b/test/cctest/compiler/test-node.cc index 6fe8573..da10d25 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); } -- 2.7.4