Mark the simulate before EnterInlined with BailoutId::None(), and set ReturnId on EnterInlined. Whe…

src/hydrogen-instructions.cc

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()) {

[titzer, 2014/04/24 14:34:11]

Do we still need the !HasAstId() check now?

[Toon Verwaest, 2014/04/24 15:06:36]

Yes, this is used to merge the simulate of the last argument evaluation (or
method loading I suppose) into the simulate before EnterInlined that now has
BailoutId::None(). If this happens, we replace BailoutId::None() with the ast_id
of the last simulate. 

On 2014/04/24 14:34:11, titzer wrote:

+    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());

[titzer, 2014/04/24 14:34:11]

Yay

 }