Reland "Pass a Code object to Assembler::(set_)target_address_at for use by ool constant pool."

src/serialize.cc

Index: src/serialize.cc
diff --git a/src/serialize.cc b/src/serialize.cc
index 30a05d53029c1e2954491a59ab98c81a74ff89f5..7e9f4f56cf9b6c1870f0b9e212373d8c87afea73 100644
--- a/src/serialize.cc
+++ b/src/serialize.cc
@@ -983,6 +983,7 @@ void Deserializer::ReadChunk(Object** current,
                 reinterpret_cast<Address>(current);                            \
             Assembler::deserialization_set_special_target_at(                  \
                 location_of_branch_data,                                       \
+                Code::cast(HeapObject::FromAddress(current_object_address)),   \
                 reinterpret_cast<Address>(new_object));                        \
             location_of_branch_data += Assembler::kSpecialTargetSize;          \
             current = reinterpret_cast<Object**>(location_of_branch_data);     \