| Index: src/objects.cc
|
| diff --git a/src/objects.cc b/src/objects.cc
|
| index 1ff56694c08f3a9a4d18fc820ff1ab2311b775d9..f7bb7c41fab08881afd526c294b1fdb38b61e2ff 100644
|
| --- a/src/objects.cc
|
| +++ b/src/objects.cc
|
| @@ -13988,7 +13988,6 @@ void Code::CopyFrom(const CodeDesc& desc) {
|
| static_cast<size_t>(desc.reloc_size));
|
|
|
| // unbox handles and relocate
|
| - intptr_t delta = instruction_start() - desc.buffer;
|
| int mode_mask = RelocInfo::kCodeTargetMask |
|
| RelocInfo::ModeMask(RelocInfo::EMBEDDED_OBJECT) |
|
| RelocInfo::ModeMask(RelocInfo::CELL) |
|
| @@ -14008,8 +14007,8 @@ void Code::CopyFrom(const CodeDesc& desc) {
|
| it.rinfo()->set_target_cell(*cell, UPDATE_WRITE_BARRIER,
|
| SKIP_ICACHE_FLUSH);
|
| } else if (RelocInfo::IsCodeTarget(mode)) {
|
| - // rewrite code handles in inline cache targets to direct
|
| - // pointers to the first instruction in the code object
|
| + // rewrite code handles to direct pointers to the first instruction in the
|
| + // code object
|
| Handle<Object> p = it.rinfo()->target_object_handle(origin);
|
| Code* code = Code::cast(*p);
|
| it.rinfo()->set_target_address(GetIsolate(), code->instruction_start(),
|
| @@ -14023,6 +14022,7 @@ void Code::CopyFrom(const CodeDesc& desc) {
|
| Code* code = Code::cast(*p);
|
| it.rinfo()->set_code_age_stub(code, SKIP_ICACHE_FLUSH);
|
| } else {
|
| + intptr_t delta = instruction_start() - desc.buffer;
|
| it.rinfo()->apply(delta);
|
| }
|
| }
|
|
|