[serializer][heap] Record references in deserialized code objects.

src/snapshot/deserializer.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/snapshot/deserializer.h"
 
 #include "src/bootstrapper.h"
 #include "src/external-reference-table.h"
 #include "src/heap/heap.h"
 #include "src/isolate.h"
@@ skipping 19 matching lines @@
 
 void Deserializer::FlushICacheForNewIsolate() {
   DCHECK(!deserializing_user_code_);
   // The entire isolate is newly deserialized. Simply flush all code pages.
   for (Page* p : *isolate_->heap()->code_space()) {
     Assembler::FlushICache(isolate_, p->area_start(),
                            p->area_end() - p->area_start());
   }
 }
 
-void Deserializer::FlushICacheForNewCodeObjects() {
+void Deserializer::FlushICacheForNewCodeObjectsAndRecordEmbeddedObjects() {
   DCHECK(deserializing_user_code_);
   for (Code* code : new_code_objects_) {
+    // Record all references to embedded objects in the new code object.
+    for (RelocIterator it(code,
+                          RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT));
+         !it.done(); it.next()) {
+      isolate_->heap()->RecordWriteIntoCode(code, it.rinfo(),

[Yang, 2016/08/03 12:29:52]

This entire for loop is duplicate code from CopyCode. Could we have it only once
and call to it?

[ahaas, 2016/08/04 08:54:11]

Done.

+                                            it.rinfo()->target_object());
+    }
+
     if (FLAG_serialize_age_code) code->PreAge(isolate_);
     Assembler::FlushICache(isolate_, code->instruction_start(),
                            code->instruction_size());
   }
 }
 
 bool Deserializer::ReserveSpace() {
 #ifdef DEBUG
   for (int i = NEW_SPACE; i < kNumberOfSpaces; ++i) {
     CHECK(reservations_[i].length() > 0);
@@ skipping 87 matching lines @@
     return Handle<SharedFunctionInfo>();
   } else {
     deserializing_user_code_ = true;
     HandleScope scope(isolate);
     Handle<SharedFunctionInfo> result;
     {
       DisallowHeapAllocation no_gc;
       Object* root;
       VisitPointer(&root);
       DeserializeDeferredObjects();
-      FlushICacheForNewCodeObjects();
+      FlushICacheForNewCodeObjectsAndRecordEmbeddedObjects();
       result = Handle<SharedFunctionInfo>(SharedFunctionInfo::cast(root));
       isolate->heap()->RegisterReservationsForBlackAllocation(reservations_);
     }
     CommitPostProcessedObjects(isolate);
     return scope.CloseAndEscape(result);
   }
 }
 
 Deserializer::~Deserializer() {
   // TODO(svenpanne) Re-enable this assertion when v8 initialization is fixed.
@@ skipping 645 matching lines @@
 
       default:
         CHECK(false);
     }
   }
   CHECK_EQ(limit, current);
   return true;
 }
 }  // namespace internal
 }  // namespace v8