Cache optimized code for OSR.

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 1049 matching lines @@
     candidate = next_candidate;
   }
 
   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 kContextOffset = SharedFunctionInfo::kContextOffset;

[titzer, 2013/12/16 11:59:34]

Duplicated constants for code shortitude below. Probably better to have a
subroutine...

+  static const int kCodeOffset = SharedFunctionInfo::kCachedCodeOffset;
+  static const int kLiteralsOffset = SharedFunctionInfo::kLiteralsOffset;
+  static const int kOsrAstIdOffset = SharedFunctionInfo::kOsrAstIdOffset;
+  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();
     for (int i = kEntriesStart; i < old_length; i += kEntryLength) {
       Code* code = Code::cast(code_map->get(i + kCodeOffset));
       MarkBit code_mark = Marking::MarkBitFrom(code);
       if (!code_mark.Get()) {
         continue;
       }
 
       // Update and record the context slot in the optimized code map.
       Object** context_slot = HeapObject::RawField(code_map,

[titzer, 2013/12/16 11:59:34]

Ack, this code is horrible; can we please extract a function here?

           FixedArray::OffsetOfElementAt(new_length));
       code_map->set(new_length++, code_map->get(i + kContextOffset));
       ASSERT(Marking::IsBlack(
           Marking::MarkBitFrom(HeapObject::cast(*context_slot))));
       isolate_->heap()->mark_compact_collector()->
           RecordSlot(context_slot, context_slot, *context_slot);
 
       // Update and record the code slot in the optimized code map.
       Object** code_slot = HeapObject::RawField(code_map,
           FixedArray::OffsetOfElementAt(new_length));
       code_map->set(new_length++, code_map->get(i + kCodeOffset));
       ASSERT(Marking::IsBlack(
           Marking::MarkBitFrom(HeapObject::cast(*code_slot))));
       isolate_->heap()->mark_compact_collector()->
           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 OSR AST id.  No write barrier necessary for a smi.
+      ASSERT(code_map->get(i + kOsrAstIdOffset)->IsSmi());
+      code_map->set(new_length++, code_map->get(i + kOsrAstIdOffset));
     }
 
     // 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 3236 matching lines @@
   while (buffer != NULL) {
     SlotsBuffer* next_buffer = buffer->next();
     DeallocateBuffer(buffer);
     buffer = next_buffer;
   }
   *buffer_address = NULL;
 }
 
 
 } }  // namespace v8::internal