Skip to content
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.

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

deps: backport 224d376 from V8 upstream #10526

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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 5
#define V8_MINOR_VERSION 4
#define V8_BUILD_NUMBER 500
#define V8_PATCH_LEVEL 45
#define V8_PATCH_LEVEL 46

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
25 changes: 25 additions & 0 deletions deps/v8/src/api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,12 @@ HandleScope::~HandleScope() {
i::HandleScope::CloseScope(isolate_, prev_next_, prev_limit_);
}

V8_NORETURN void* HandleScope::operator new(size_t) {
base::OS::Abort();
abort();
}

void HandleScope::operator delete(void*, size_t) { base::OS::Abort(); }

int HandleScope::NumberOfHandles(Isolate* isolate) {
return i::HandleScope::NumberOfHandles(
Expand Down Expand Up @@ -913,6 +919,13 @@ i::Object** EscapableHandleScope::Escape(i::Object** escape_value) {
return escape_slot_;
}

V8_NORETURN void* EscapableHandleScope::operator new(size_t) {
base::OS::Abort();
abort();
}

void EscapableHandleScope::operator delete(void*, size_t) { base::OS::Abort(); }

SealHandleScope::SealHandleScope(Isolate* isolate)
: isolate_(reinterpret_cast<i::Isolate*>(isolate)) {
i::HandleScopeData* current = isolate_->handle_scope_data();
Expand All @@ -931,6 +944,12 @@ SealHandleScope::~SealHandleScope() {
current->sealed_level = prev_sealed_level_;
}

V8_NORETURN void* SealHandleScope::operator new(size_t) {
base::OS::Abort();
abort();
}

void SealHandleScope::operator delete(void*, size_t) { base::OS::Abort(); }

void Context::Enter() {
i::Handle<i::Context> env = Utils::OpenHandle(this);
Expand Down Expand Up @@ -2315,6 +2334,12 @@ v8::TryCatch::~TryCatch() {
}
}

V8_NORETURN void* v8::TryCatch::operator new(size_t) {
base::OS::Abort();
abort();
}

void v8::TryCatch::operator delete(void*, size_t) { base::OS::Abort(); }

bool v8::TryCatch::HasCaught() const {
return !reinterpret_cast<i::Object*>(exception_)->IsTheHole(isolate_);
Expand Down