diff --git a/common.gypi b/common.gypi index 39229ef58787..2967d1e63a48 100644 --- a/common.gypi +++ b/common.gypi @@ -44,7 +44,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.39', + 'v8_embedder_string': '-node.40', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/objects/code.cc b/deps/v8/src/objects/code.cc index ddc928254e83..a035b69aeb52 100644 --- a/deps/v8/src/objects/code.cc +++ b/deps/v8/src/objects/code.cc @@ -226,6 +226,10 @@ void Code::SetMarkedForDeoptimization(Isolate* isolate, } else { jdt.SetCodeNoWriteBarrier(handle, *BUILTIN_CODE(isolate, CompileLazy)); } + // TODO(olivf, 525686865): Fix the race in dispatch handle marking by + // going back to a CAS loop. + static_assert(JSDispatchTable::kWriteBarrierSetsEntryMarkBit); + jdt.Mark(handle); } // Ensure we don't try to patch the entry multiple times. set_js_dispatch_handle(kNullJSDispatchHandle);