Skip to content

Commit 85ffec2

Browse files
committed
deps: backport bits of 9302db480e8 from upstream V8
Backport parts of v8/v8@9302db480e8cd7c88fd948baf0cf that fix compiler errors on Windows. Original commit message: [ubsan] Port HeapObject to the new design Merging the temporary HeapObjectPtr back into HeapObject. Bug: v8:3770 Change-Id: I5bcd23ca2f5ba862cf5b52955dca143e531c637b Reviewed-on: https://chromium-review.googlesource.com/c/1386492 Commit-Queue: Jakob Kummerow <[email protected]> Reviewed-by: Clemens Hammacher <[email protected]> Reviewed-by: Ulan Degenbaev <[email protected]> Reviewed-by: Michael Stanton <[email protected]> Reviewed-by: Jakob Gruber <[email protected]> Cr-Commit-Position: refs/heads/master@{#58410} Refs: v8/v8@9302db4
1 parent f9142b8 commit 85ffec2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

deps/v8/src/ia32/assembler-ia32-inl.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void RelocInfo::set_target_object(Heap* heap, HeapObject* target,
109109
if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
110110
Assembler::FlushICache(pc_, sizeof(Address));
111111
}
112-
if (write_barrier_mode == UPDATE_WRITE_BARRIER && host() != nullptr) {
112+
if (write_barrier_mode == UPDATE_WRITE_BARRIER && !host().is_null()) {
113113
WriteBarrierForCode(host(), this, target);
114114
}
115115
}
@@ -279,7 +279,8 @@ Address Assembler::target_address_from_return_address(Address pc) {
279279
void Assembler::deserialization_set_special_target_at(
280280
Address instruction_payload, Code code, Address target) {
281281
set_target_address_at(instruction_payload,
282-
code ? code->constant_pool() : kNullAddress, target);
282+
!code.is_null() ? code->constant_pool() : kNullAddress,
283+
target);
283284
}
284285

285286
int Assembler::deserialization_special_target_size(

0 commit comments

Comments
 (0)