Skip to content

v8: forward compatibility to current V8 master #12875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 14 commits into from
Closed

v8: forward compatibility to current V8 master #12875

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
de4eaf3
deps: backport 78867ad8707a016 from v8 upstream
mlippautz Mar 2, 2017
04eff20
deps: backport de1461b7efd from upstream v8
addaleax Mar 6, 2017
90ed326
deps: backport 2cd2f5feff3 from upstream v8
jeisinger Mar 13, 2017
501d569
deps: backport 3700a01c82 from upstream v8
jeremyroman Mar 17, 2017
e27da40
deps: backport 4acdb5eec2c from upstream v8
jeremyroman Mar 17, 2017
ac5c950
v8: backport pieces from 99743ad460e
addaleax May 6, 2017
e8fecc4
v8: backport pieces of 6226576efa82ee
addaleax May 6, 2017
2f6c4bd
v8: backport header diff from da5b745dba387
addaleax May 6, 2017
21eea69
v8: backport pieces of bf463c4dc0 and dc662e5b74
addaleax May 6, 2017
01605c0
v8: backport header diff from 94283dcf4459f
addaleax May 6, 2017
c107737
v8: backport header diff from 2e4a68733803
addaleax May 6, 2017
cbf3ecf
deps: backport 4fdf9fd4813 from upstream v8
jeisinger Apr 21, 2017
932bd46
v8: do not test v8 with -Werror
addaleax May 6, 2017
ecf7ea5
v8: backport pieces of dab18fb0bbcdd
addaleax May 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
deps: backport 4acdb5eec2c from upstream v8 
Original commit message:

    Give v8::Eternal a direct reference to the handle.

    This makes it more similar to other handle types (like PersistentBase),
    by simply storing an i::Object** cast to T*. This means that it is not
    necessary to look up the handle in the eternal handles table to access
    the underlying value.

    Like the built-in roots (null, etc.), an eternal handle can never be
    destroyed, so we don't even need to allocate a separate local handle.
    Instead, the Local<T> can point directly at the eternal reference.
    This makes Eternal<T>::Get trivial.

    Review-Url: https://codereview.chromium.org/2751263003
    Cr-Commit-Position: refs/heads/master@{#43912}

Ref: v8/v8@4acdb5eec2c
  • Loading branch information
@jeremyroman @addaleax
jeremyroman authored and addaleax committed May 6, 2017
commit e27da4093b646c587997da64848f369fd1c572a7
23 changes: 11 additions & 12 deletions deps/v8/include/v8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,19 +360,18 @@ class MaybeLocal {
// Eternal handles are set-once handles that live for the life of the isolate.
template <class T> class Eternal {
public:
V8_INLINE Eternal() : index_(kInitialValue) { }
template<class S>
V8_INLINE Eternal(Isolate* isolate, Local<S> handle) : index_(kInitialValue) {
V8_INLINE Eternal() : val_(nullptr) {}
template <class S>
V8_INLINE Eternal(Isolate* isolate, Local<S> handle) : val_(nullptr) {
Set(isolate, handle);
}
// Can only be safely called if already set.
V8_INLINE Local<T> Get(Isolate* isolate) const;
V8_INLINE bool IsEmpty() const { return index_ == kInitialValue; }
V8_INLINE bool IsEmpty() const { return val_ == nullptr; }
template<class S> V8_INLINE void Set(Isolate* isolate, Local<S> handle);

private:
static const int kInitialValue = -1;
int index_;
T* val_;
};


Expand Down Expand Up @@ -7628,10 +7627,7 @@ class V8_EXPORT V8 {
WeakCallbackInfo<void>::Callback weak_callback);
static void MakeWeak(internal::Object*** location_addr);
static void* ClearWeak(internal::Object** location);
static void Eternalize(Isolate* isolate,
Value* handle,
int* index);
static Local<Value> GetEternal(Isolate* isolate, int index);
static Value* Eternalize(Isolate* isolate, Value* handle);

static void RegisterExternallyReferencedObject(internal::Object** object,
internal::Isolate* isolate);
Expand Down Expand Up @@ -8596,12 +8592,15 @@ template<class T>
template<class S>
void Eternal<T>::Set(Isolate* isolate, Local<S> handle) {
TYPE_CHECK(T, S);
V8::Eternalize(isolate, reinterpret_cast<Value*>(*handle), &this->index_);
val_ = reinterpret_cast<T*>(
V8::Eternalize(isolate, reinterpret_cast<Value*>(*handle)));
}

template <class T>
Local<T> Eternal<T>::Get(Isolate* isolate) const {
return Local<T>(reinterpret_cast<T*>(*V8::GetEternal(isolate, index_)));
// The eternal handle will never go away, so as with the roots, we don't even
// need to open a handle.
return Local<T>(val_);
}


Expand Down
14 changes: 5 additions & 9 deletions deps/v8/src/api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,17 +936,13 @@ void V8::DisposeGlobal(i::Object** location) {
i::GlobalHandles::Destroy(location);
}


void V8::Eternalize(Isolate* v8_isolate, Value* value, int* index) {
Value* V8::Eternalize(Isolate* v8_isolate, Value* value) {
i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
i::Object* object = *Utils::OpenHandle(value);
isolate->eternal_handles()->Create(isolate, object, index);
}


Local<Value> V8::GetEternal(Isolate* v8_isolate, int index) {
i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
return Utils::ToLocal(isolate->eternal_handles()->Get(index));
int index = -1;
isolate->eternal_handles()->Create(isolate, object, &index);
return reinterpret_cast<Value*>(
isolate->eternal_handles()->Get(index).location());
}


Expand Down