Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(515)

Unified Diff: src/hydrogen.cc

Issue 14838012: Revert r14610 because of test-262 failures. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/hydrogen.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index f34934c85a14ba35aabc93d0b21485c62f8686ed..2a1f84c369c432fc3c32bd8867a9f6b6d91aa8fa 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -752,7 +752,6 @@ void HGraphBuilder::IfBuilder::AddCompare(HControlInstruction* compare) {
compare->SetSuccessorAt(1, split_edge);
}
split_edge->GotoNoSimulate(split_edge_merge_block_);
- ASSERT(builder_->SafeToAddPhiInNoSideEffectsScope());
} else {
compare->SetSuccessorAt(0, first_true_block_);
compare->SetSuccessorAt(1, first_false_block_);
@@ -770,7 +769,6 @@ void HGraphBuilder::IfBuilder::Or() {
split_edge_merge_block_ =
builder_->CreateBasicBlock(env->Copy());
first_true_block_->GotoNoSimulate(split_edge_merge_block_);
- ASSERT(builder_->SafeToAddPhiInNoSideEffectsScope());
first_true_block_ = split_edge_merge_block_;
}
builder_->set_current_block(first_false_block_);
@@ -785,7 +783,6 @@ void HGraphBuilder::IfBuilder::And() {
if (split_edge_merge_block_ == NULL) {
split_edge_merge_block_ = builder_->CreateBasicBlock(env->Copy());
first_false_block_->GotoNoSimulate(split_edge_merge_block_);
- ASSERT(builder_->SafeToAddPhiInNoSideEffectsScope());
first_false_block_ = split_edge_merge_block_;
}
builder_->set_current_block(first_true_block_);
@@ -817,7 +814,6 @@ void HGraphBuilder::IfBuilder::Then() {
// Handle if's without any expressions, they jump directly to the "else"
// branch.
builder_->current_block()->GotoNoSimulate(first_false_block_);
- ASSERT(builder_->SafeToAddPhiInNoSideEffectsScope());
first_true_block_ = NULL;
}
builder_->set_current_block(first_true_block_);
@@ -880,7 +876,6 @@ void HGraphBuilder::IfBuilder::End() {
ASSERT(!last_false_block->IsFinished());
last_true_block_->GotoNoSimulate(merge_block_);
last_false_block->GotoNoSimulate(merge_block_);
- ASSERT(builder_->SafeToAddPhiInNoSideEffectsScope());
builder_->set_current_block(merge_block_);
}
}
@@ -913,7 +908,6 @@ HValue* HGraphBuilder::LoopBuilder::BeginBody(
phi_->AssumeRepresentation(Representation::Integer32());
env->Push(initial);
builder_->current_block()->GotoNoSimulate(header_block_);
- ASSERT(builder_->SafeToAddPhiInNoSideEffectsScope());
HEnvironment* body_env = env->Copy();
HEnvironment* exit_env = env->Copy();
@@ -968,7 +962,6 @@ void HGraphBuilder::LoopBuilder::EndBody() {
// Push the new increment value on the expression stack to merge into the phi.
builder_->environment()->Push(increment_);
builder_->current_block()->GotoNoSimulate(header_block_);
- ASSERT(builder_->SafeToAddPhiInNoSideEffectsScope());
header_block_->loop_information()->RegisterBackEdge(body_block_);
builder_->set_current_block(exit_block_);
@@ -8235,7 +8228,6 @@ HValue* HOptimizedGraphBuilder::HandlePolymorphicElementAccess(
access->set_position(position);
}
if_jsarray->GotoNoSimulate(join);
- ASSERT(SafeToAddPhiInNoSideEffectsScope());
set_current_block(if_fastobject);
length = AddInstruction(new(zone()) HFixedArrayBaseLength(elements));
@@ -8262,7 +8254,6 @@ HValue* HOptimizedGraphBuilder::HandlePolymorphicElementAccess(
Push(access);
}
current_block()->GotoNoSimulate(join);
- ASSERT(SafeToAddPhiInNoSideEffectsScope());
set_current_block(if_false);
}
}
« no previous file with comments | « src/hydrogen.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698