Skip to content

Commit

Permalink
deps: patch V8 to 6.6.346.32
Browse files Browse the repository at this point in the history
PR-URL: #20748
Refs: v8/v8@6.6.346.31...6.6.346.32
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
  • Loading branch information
MylesBorins authored and BridgeAR committed May 18, 2018
1 parent 59f71ea commit 3424f71
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion deps/v8/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 6
#define V8_MINOR_VERSION 6
#define V8_BUILD_NUMBER 346
#define V8_PATCH_LEVEL 31
#define V8_PATCH_LEVEL 32

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
20 changes: 14 additions & 6 deletions deps/v8/src/managed.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,30 @@ class Managed : public Foreign {
isolate->factory()->NewForeign(reinterpret_cast<Address>(finalizer)));
Handle<Object> global_handle = isolate->global_handles()->Create(*handle);
finalizer->global_handle_location = global_handle.location();
GlobalHandles::MakeWeak(finalizer->global_handle_location,
handle->GetFinalizer(), &Managed<CppType>::GCDelete,
v8::WeakCallbackType::kParameter);
GlobalHandles::MakeWeak(
finalizer->global_handle_location, handle->GetFinalizer(),
&ResetWeakAndScheduleGCDelete, v8::WeakCallbackType::kParameter);

return handle;
}

private:
static void GCDelete(const v8::WeakCallbackInfo<void>& data) {
static void ResetWeakAndScheduleGCDelete(
const v8::WeakCallbackInfo<void>& data) {
FinalizerWithHandle* finalizer =
reinterpret_cast<FinalizerWithHandle*>(data.GetParameter());

GlobalHandles::Destroy(finalizer->global_handle_location);
Isolate* isolate = reinterpret_cast<Isolate*>(data.GetIsolate());
isolate->UnregisterFromReleaseAtTeardown(finalizer);
// We need to call GCDelete as a second pass callback because
// it can trigger garbage collection. The first pass callbacks
// are not allowed to invoke V8 API.
data.SetSecondPassCallback(&GCDelete);
}

GlobalHandles::Destroy(finalizer->global_handle_location);
static void GCDelete(const v8::WeakCallbackInfo<void>& data) {
FinalizerWithHandle* finalizer =
reinterpret_cast<FinalizerWithHandle*>(data.GetParameter());
NativeDelete(finalizer);
}

Expand Down

0 comments on commit 3424f71

Please sign in to comment.