Disentangle assembler from isolate.

src/heap/remembered-set.h

 // 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.
 
 #ifndef V8_REMEMBERED_SET_H
 #define V8_REMEMBERED_SET_H
 
 #include "src/assembler.h"
 #include "src/heap/heap.h"
 #include "src/heap/slot-set.h"
@@ skipping 282 matching lines @@
     }
     return result;
   }
 
   // Updates a code target slot using an untyped slot callback.
   // The callback accepts Object** and returns SlotCallbackResult.
   template <typename Callback>
   static SlotCallbackResult UpdateCodeTarget(RelocInfo* rinfo,
                                              Callback callback) {
     DCHECK(RelocInfo::IsCodeTarget(rinfo->rmode()));
-    Object* target = Code::GetCodeFromTargetAddress(rinfo->target_address());
-    Object* old_target = target;
-    SlotCallbackResult result = callback(&target);
-    if (target != old_target) {
-      rinfo->set_target_address(Code::cast(target)->instruction_start());
+    Code* old_target = Code::GetCodeFromTargetAddress(rinfo->target_address());
+    Object* new_target = old_target;
+    SlotCallbackResult result = callback(&new_target);
+    if (new_target != old_target) {
+      rinfo->set_target_address(old_target->GetIsolate(),
+                                Code::cast(new_target)->instruction_start());
     }
     return result;
   }
 
   // Updates an embedded pointer slot using an untyped slot callback.
   // The callback accepts Object** and returns SlotCallbackResult.
   template <typename Callback>
   static SlotCallbackResult UpdateEmbeddedPointer(RelocInfo* rinfo,
                                                   Callback callback) {
     DCHECK(rinfo->rmode() == RelocInfo::EMBEDDED_OBJECT);
     HeapObject* old_target = rinfo->target_object();
     Object* new_target = old_target;
     SlotCallbackResult result = callback(&new_target);
     if (new_target != old_target) {
       rinfo->set_target_object(HeapObject::cast(new_target));
     }
     return result;
   }
 
   // Updates a debug target slot using an untyped slot callback.
   // The callback accepts Object** and returns SlotCallbackResult.
   template <typename Callback>
   static SlotCallbackResult UpdateDebugTarget(RelocInfo* rinfo,
                                               Callback callback) {
     DCHECK(RelocInfo::IsDebugBreakSlot(rinfo->rmode()) &&
            rinfo->IsPatchedDebugBreakSlotSequence());
-    Object* target =
+    Code* old_target =
         Code::GetCodeFromTargetAddress(rinfo->debug_call_address());
-    SlotCallbackResult result = callback(&target);
-    rinfo->set_debug_call_address(Code::cast(target)->instruction_start());
+    Object* new_target = old_target;
+    SlotCallbackResult result = callback(&new_target);
+    rinfo->set_debug_call_address(old_target->GetIsolate(),
+                                  Code::cast(new_target)->instruction_start());
     return result;
   }
 
   // Updates a typed slot using an untyped slot callback.
   // The callback accepts Object** and returns SlotCallbackResult.
   template <typename Callback>
   static SlotCallbackResult UpdateTypedSlot(Isolate* isolate,
                                             SlotType slot_type, Address addr,
                                             Callback callback) {
     switch (slot_type) {
       case CODE_TARGET_SLOT: {
-        RelocInfo rinfo(isolate, addr, RelocInfo::CODE_TARGET, 0, NULL);
+        RelocInfo rinfo(addr, RelocInfo::CODE_TARGET, 0, NULL);
         return UpdateCodeTarget(&rinfo, callback);
       }
       case CELL_TARGET_SLOT: {
-        RelocInfo rinfo(isolate, addr, RelocInfo::CELL, 0, NULL);
+        RelocInfo rinfo(addr, RelocInfo::CELL, 0, NULL);
         return UpdateCell(&rinfo, callback);
       }
       case CODE_ENTRY_SLOT: {
         return UpdateCodeEntry(addr, callback);
       }
       case DEBUG_TARGET_SLOT: {
-        RelocInfo rinfo(isolate, addr, RelocInfo::DEBUG_BREAK_SLOT_AT_POSITION,
-                        0, NULL);
+        RelocInfo rinfo(addr, RelocInfo::DEBUG_BREAK_SLOT_AT_POSITION, 0, NULL);
         if (rinfo.IsPatchedDebugBreakSlotSequence()) {
           return UpdateDebugTarget(&rinfo, callback);
         }
         return REMOVE_SLOT;
       }
       case EMBEDDED_OBJECT_SLOT: {
-        RelocInfo rinfo(isolate, addr, RelocInfo::EMBEDDED_OBJECT, 0, NULL);
+        RelocInfo rinfo(addr, RelocInfo::EMBEDDED_OBJECT, 0, NULL);
         return UpdateEmbeddedPointer(&rinfo, callback);
       }
       case OBJECT_SLOT: {
         return callback(reinterpret_cast<Object**>(addr));
       }
       case CLEARED_SLOT:
         break;
     }
     UNREACHABLE();
     return REMOVE_SLOT;
@@ skipping 11 matching lines @@
     return DEBUG_TARGET_SLOT;
   }
   UNREACHABLE();
   return CLEARED_SLOT;
 }
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_REMEMBERED_SET_H