Register dependent codes before populating deoptimization data, which can cause GC.

src/lithium.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 439 matching lines @@
 
   if (generator.GenerateCode()) {
     if (FLAG_trace_codegen) {
       PrintF("Crankshaft Compiler - ");
     }
     CodeGenerator::MakeCodePrologue(info());
     Code::Flags flags = Code::ComputeFlags(kind);
     Handle<Code> code =
         CodeGenerator::MakeCodeEpilogue(&assembler, flags, info());
     generator.FinishCode(code);
-    if (FLAG_weak_embedded_maps_in_optimized_code) {
-      RegisterDependentCodeForEmbeddedMaps(code);
-    }
     CodeGenerator::PrintCode(code, info());
     return code;
   }
   return Handle<Code>::null();
 }
 
 
-void LChunk::RegisterDependentCodeForEmbeddedMaps(Handle<Code> code) {
-  ZoneList<Handle<Map> > maps(1, zone());
-  int mode_mask = RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT);
-  for (RelocIterator it(*code, mode_mask); !it.done(); it.next()) {
-    RelocInfo::Mode mode = it.rinfo()->rmode();
-    if (mode == RelocInfo::EMBEDDED_OBJECT &&
-        it.rinfo()->target_object()->IsMap()) {
-      Handle<Map> map(Map::cast(it.rinfo()->target_object()));
-      if (map->CanTransition()) {
-        maps.Add(map, zone());
-      }
-    }
-  }
-#ifdef VERIFY_HEAP
-  // This disables verification of weak embedded maps after full GC.
-  // AddDependentCode can cause a GC, which would observe the state where
-  // this code is not yet in the depended code lists of the embedded maps.
-  NoWeakEmbeddedMapsVerificationScope disable_verification_of_embedded_maps;
-#endif
-  for (int i = 0; i < maps.length(); i++) {
-    maps.at(i)->AddDependentCode(code);
-  }
-}
-
-
 void LChunk::set_allocated_double_registers(BitVector* allocated_registers) {
   allocated_double_registers_ = allocated_registers;
   BitVector* doubles = allocated_double_registers();
   BitVector::Iterator iterator(doubles);
   while (!iterator.Done()) {
     if (info()->saves_caller_doubles()) {
       if (kDoubleSize == kPointerSize * 2) {
         spill_slot_count_ += 2;
       } else {
         spill_slot_count_++;
       }
     }
     iterator.Advance();
   }
 }
 
 
 } }  // namespace v8::internal