HandleScope callback improvements

Author: prikolium-cfx

HandleScope.py

@@ -2,7 +2,7 @@ diff --git forkSrcPrefix/deps/v8/src/api/api.cc forkDstPrefix/deps/v8/src/api/ap
 index f9ce798dc29e1d48c6cb4de84cbcea9ddae0106b..ef607b02a7feaeca918abedbef86d16497ca8809 100644
 --- forkSrcPrefix/deps/v8/src/api/api.cc
 +++ forkDstPrefix/deps/v8/src/api/api.cc
-@@ -883,7 +883,21 @@ void InternalFieldOutOfBounds(int index) {
+@@ -883,7 +883,24 @@ void InternalFieldOutOfBounds(int index) {
 
  // --- H a n d l e s ---
 
@@ -18,30 +18,33 @@ index f9ce798dc29e1d48c6cb4de84cbcea9ddae0106b..ef607b02a7feaeca918abedbef86d164
 +
 +HandleScope::HandleScope(Isolate* v8_isolate) {
 +  if(g_enterScopeCB) {
-+    g_enterScopeCB(v8_isolate);
++    i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
++    if(i_isolate->handle_scope_data()->level == 0) {
++      g_enterScopeCB(v8_isolate);
++    }
 +  }
 +  Initialize(v8_isolate);
 +}
 
  void HandleScope::Initialize(Isolate* v8_isolate) {
    i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
-@@ -912,6 +926,9 @@ HandleScope::~HandleScope() {
+@@ -912,6 +929,9 @@ HandleScope::~HandleScope() {
    CHECK_EQ(scope_level_, i_isolate_->handle_scope_data()->level);
  #endif
    i::HandleScope::CloseScope(i_isolate_, prev_next_, prev_limit_);
-+  if(g_leaveScopeCB) {
++  if(g_leaveScopeCB && i_isolate_->handle_scope_data()->level == 0) {
 +    g_leaveScopeCB(reinterpret_cast<Isolate*>(i_isolate_));
 +  }
  }
 
  void* HandleScope::operator new(size_t) { base::OS::Abort(); }
-@@ -938,6 +955,9 @@ i::Address* HandleScope::CreateHandleForCurrentIsolate(i::Address value) {
+@@ -938,6 +958,9 @@ i::Address* HandleScope::CreateHandleForCurrentIsolate(i::Address value) {
  #endif  // V8_ENABLE_DIRECT_LOCAL
 
  EscapableHandleScopeBase::EscapableHandleScopeBase(Isolate* v8_isolate) {
-+  if(g_enterScopeCB) {
+   i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
++  if(g_enterScopeCB && i_isolate->handle_scope_data()->level == 0) {
 +    g_enterScopeCB(v8_isolate);
 +  }
-   i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
    escape_slot_ = CreateHandle(
        i_isolate, i::ReadOnlyRoots(i_isolate).the_hole_value().ptr());