Use optimized code map to cache OSR code.

src/mark-compact.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 1050 matching lines @@
   shared_function_info_candidates_head_ = NULL;
 }
 
 
 void CodeFlusher::ProcessOptimizedCodeMaps() {
   static const int kEntriesStart = SharedFunctionInfo::kEntriesStart;
   static const int kEntryLength = SharedFunctionInfo::kEntryLength;
   static const int kContextOffset = 0;
   static const int kCodeOffset = 1;
   static const int kLiteralsOffset = 2;
-  STATIC_ASSERT(kEntryLength == 3);
+  static const int kOsrAstIdOffset = 3;
+  STATIC_ASSERT(kEntryLength == 4);
 
   SharedFunctionInfo* holder = optimized_code_map_holder_head_;
   SharedFunctionInfo* next_holder;
   while (holder != NULL) {
     next_holder = GetNextCodeMap(holder);
     ClearNextCodeMap(holder);
 
     FixedArray* code_map = FixedArray::cast(holder->optimized_code_map());
     int new_length = kEntriesStart;
     int old_length = code_map->length();
@@ skipping 23 matching lines @@
           RecordSlot(code_slot, code_slot, *code_slot);
 
       // Update and record the literals slot in the optimized code map.
       Object** literals_slot = HeapObject::RawField(code_map,
           FixedArray::OffsetOfElementAt(new_length));
       code_map->set(new_length++, code_map->get(i + kLiteralsOffset));
       ASSERT(Marking::IsBlack(
           Marking::MarkBitFrom(HeapObject::cast(*literals_slot))));
       isolate_->heap()->mark_compact_collector()->
           RecordSlot(literals_slot, literals_slot, *literals_slot);
+
+      // Update and record the osr ast id slot in the optimized code map.
+      code_map->set(new_length++, code_map->get(i + kOsrAstIdOffset));
+      ASSERT(code_map->get(i + kOsrAstIdOffset)->IsSmi());
     }
 
     // Trim the optimized code map if entries have been removed.
     if (new_length < old_length) {
       holder->TrimOptimizedCodeMap(old_length - new_length);
     }
 
     holder = next_holder;
   }
 
@@ skipping 3242 matching lines @@
   while (buffer != NULL) {
     SlotsBuffer* next_buffer = buffer->next();
     DeallocateBuffer(buffer);
     buffer = next_buffer;
   }
   *buffer_address = NULL;
 }
 
 
 } }  // namespace v8::internal