Index: src/hydrogen-instructions.cc |
diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc |
index c56f5dc36f8cce87074c070cf4486746d1ad6272..ceedafc091ad5544b16aa076d8289323f96c9d1f 100644 |
--- a/src/hydrogen-instructions.cc |
+++ b/src/hydrogen-instructions.cc |
@@ -2595,6 +2595,9 @@ void HPhi::AddIndirectUsesTo(int* dest) { |
void HSimulate::MergeWith(ZoneList<HSimulate*>* list) { |
+ if (!list->is_empty() && !HasAstId()) { |
+ set_ast_id(list->last()->ast_id()); |
+ } |
while (!list->is_empty()) { |
HSimulate* from = list->RemoveLast(); |
ZoneList<HValue*>* from_values = &from->values_; |
@@ -4504,7 +4507,7 @@ void HPhi::Verify() { |
void HSimulate::Verify() { |
HInstruction::Verify(); |
- ASSERT(HasAstId()); |
+ ASSERT(HasAstId() || next()->IsEnterInlined()); |
} |