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

src/hydrogen-instructions.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 2577 matching lines @@
 
 
 void HPhi::AddIndirectUsesTo(int* dest) {
   for (int i = 0; i < Representation::kNumRepresentations; i++) {
     dest[i] += indirect_uses_[i];
   }
 }
 
 
 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_;
     for (int i = 0; i < from_values->length(); ++i) {
       if (from->HasAssignedIndexAt(i)) {
         int index = from->GetAssignedIndexAt(i);
         if (HasValueForIndex(index)) continue;
         AddAssignedValue(index, from_values->at(i));
       } else {
         if (pop_count_ > 0) {
@@ skipping 1889 matching lines @@
     HBasicBlock* defining_block = value->block();
     HBasicBlock* predecessor_block = block()->predecessors()->at(i);
     ASSERT(defining_block == predecessor_block ||
            defining_block->Dominates(predecessor_block));
   }
 }
 
 
 void HSimulate::Verify() {
   HInstruction::Verify();
-  ASSERT(HasAstId());
+  ASSERT(HasAstId() || next()->IsEnterInlined());

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

Yay

 }
 
 
 void HCheckHeapObject::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }
 
 
 void HCheckValue::Verify() {
@@ skipping 226 matching lines @@
       break;
     case kExternalMemory:
       stream->Add("[external-memory]");
       break;
   }
 
   stream->Add("@%d", offset());
 }
 
 } }  // namespace v8::internal