Index: src/hydrogen.cc |
diff --git a/src/hydrogen.cc b/src/hydrogen.cc |
index d3d7b5837a0c5e3d9a09ba4a58ce9486773818e8..dc5f8313dbeba626aaf62c82f9b5bb0c4821bad8 100644 |
--- a/src/hydrogen.cc |
+++ b/src/hydrogen.cc |
@@ -5638,7 +5638,7 @@ void HOptimizedGraphBuilder::HandlePolymorphicNamedFieldAccess( |
smi_check = New<HIsSmiAndBranch>( |
object, empty_smi_block, not_smi_block); |
FinishCurrentBlock(smi_check); |
- Goto(empty_smi_block, number_block); |
+ GotoNoSimulate(empty_smi_block, number_block); |
set_current_block(not_smi_block); |
} else { |
BuildCheckHeapObject(object); |
@@ -5666,9 +5666,8 @@ void HOptimizedGraphBuilder::HandlePolymorphicNamedFieldAccess( |
FinishCurrentBlock(compare); |
if (info.type()->Is(Type::Number())) { |
- Goto(if_true, number_block); |
+ GotoNoSimulate(if_true, number_block); |
if_true = number_block; |
- number_block->SetJoinId(ast_id); |
} |
set_current_block(if_true); |
@@ -6844,7 +6843,7 @@ void HOptimizedGraphBuilder::HandlePolymorphicCallNamed( |
number_block = graph()->CreateBasicBlock(); |
FinishCurrentBlock(New<HIsSmiAndBranch>( |
receiver, empty_smi_block, not_smi_block)); |
- Goto(empty_smi_block, number_block); |
+ GotoNoSimulate(empty_smi_block, number_block); |
set_current_block(not_smi_block); |
} else { |
BuildCheckHeapObject(receiver); |
@@ -6869,9 +6868,8 @@ void HOptimizedGraphBuilder::HandlePolymorphicCallNamed( |
FinishCurrentBlock(compare); |
if (info.type()->Is(Type::Number())) { |
- Goto(if_true, number_block); |
+ GotoNoSimulate(if_true, number_block); |
if_true = number_block; |
- number_block->SetJoinId(expr->id()); |
} |
set_current_block(if_true); |