diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/v8/src/compiler/schedule.cc | |
parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/v8/src/compiler/schedule.cc')
-rw-r--r-- | chromium/v8/src/compiler/schedule.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/v8/src/compiler/schedule.cc b/chromium/v8/src/compiler/schedule.cc index 63f148d926e..455fcd120e1 100644 --- a/chromium/v8/src/compiler/schedule.cc +++ b/chromium/v8/src/compiler/schedule.cc @@ -34,7 +34,7 @@ bool BasicBlock::LoopContains(BasicBlock* block) const { // RPO numbers must be initialized. DCHECK(rpo_number_ >= 0); DCHECK(block->rpo_number_ >= 0); - if (loop_end_ == NULL) return false; // This is not a loop. + if (loop_end_ == nullptr) return false; // This is not a loop. return block->rpo_number_ >= rpo_number_ && block->rpo_number_ < loop_end_->rpo_number_; } @@ -140,13 +140,13 @@ BasicBlock* Schedule::block(Node* node) const { if (node->id() < static_cast<NodeId>(nodeid_to_block_.size())) { return nodeid_to_block_[node->id()]; } - return NULL; + return nullptr; } bool Schedule::IsScheduled(Node* node) { if (node->id() >= nodeid_to_block_.size()) return false; - return nodeid_to_block_[node->id()] != NULL; + return nodeid_to_block_[node->id()] != nullptr; } @@ -158,7 +158,7 @@ BasicBlock* Schedule::GetBlockById(BasicBlock::Id block_id) { bool Schedule::SameBasicBlock(Node* a, Node* b) const { BasicBlock* block = this->block(a); - return block != NULL && block == this->block(b); + return block != nullptr && block == this->block(b); } @@ -176,7 +176,7 @@ void Schedule::PlanNode(BasicBlock* block, Node* node) { os << "Planning #" << node->id() << ":" << node->op()->mnemonic() << " for future add to B" << block->id() << "\n"; } - DCHECK(this->block(node) == NULL); + DCHECK(this->block(node) == nullptr); SetBlockForNode(block, node); } @@ -187,7 +187,7 @@ void Schedule::AddNode(BasicBlock* block, Node* node) { os << "Adding #" << node->id() << ":" << node->op()->mnemonic() << " to B" << block->id() << "\n"; } - DCHECK(this->block(node) == NULL || this->block(node) == block); + DCHECK(this->block(node) == nullptr || this->block(node) == block); block->AddNode(node); SetBlockForNode(block, node); } @@ -354,7 +354,7 @@ std::ostream& operator<<(std::ostream& os, const Schedule& s) { BasicBlock::Control control = block->control(); if (control != BasicBlock::kNone) { os << " "; - if (block->control_input() != NULL) { + if (block->control_input() != nullptr) { os << *block->control_input(); } else { os << "Goto"; |