[GR-45437] [GR-45497] Backport: Adding HandleScope also for the primary weak callback.

PullRequest: js/2786

Author: iamstolis

graal-js/src/com.oracle.truffle.js.test/js/GR-45497.js

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+
+/**
+ * Regression test of Set.prototype.size getter.
+ */
+
+load("assert.js");
+
+const sizeOfThisSet = Object.getOwnPropertyDescriptor(Set.prototype, 'size').get;
+
+assertThrows(() => sizeOfThisSet.call({}), TypeError);
+assertSame(0, sizeOfThisSet.call(new Set()));
+assertThrows(() => sizeOfThisSet.call(new Map()), TypeError);

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/SetPrototypeBuiltins.java

@@ -770,7 +770,7 @@ protected static int doSet(JSSetObject thisObj) {
         }
 
         @SuppressWarnings("unused")
-        @Specialization(guards = {"!isJSMap(thisObj)"})
+        @Specialization(guards = {"!isJSSet(thisObj)"})
         protected static int notSet(@SuppressWarnings("unused") Object thisObj) {
             throw Errors.createTypeErrorSetExpected();
         }

graal-nodejs/deps/v8/src/graal/callbacks.cc

@@ -622,7 +622,10 @@ void GraalWeakCallback(JNIEnv* env, jclass nativeAccess, jlong callback, jlong d
         v8::WeakCallbackInfo<void>::Callback second_callback = nullptr;
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
         v8::WeakCallbackInfo<void> callback_info = v8::WeakCallbackInfo<void>(isolate, (void*) data, internalFields, &second_callback);
-        v8_callback(callback_info);
+        {
+            v8::HandleScope scope(isolate);
+            v8_callback(callback_info);
+        }
         if (second_callback) {
             v8::HandleScope scope(isolate);
             second_callback(callback_info);
@@ -633,7 +636,10 @@ void GraalWeakCallback(JNIEnv* env, jclass nativeAccess, jlong callback, jlong d
         v8::WeakCallbackInfo<void>::Callback second_callback = nullptr;
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
         v8::WeakCallbackInfo<void> callback_info = v8::WeakCallbackInfo<void>(isolate, internalFields[v8::kInternalFieldsInWeakCallback], internalFields, &second_callback);
-        v8_callback(callback_info);
+        {
+            v8::HandleScope scope(isolate);
+            v8_callback(callback_info);
+        }
         if (second_callback) {
             v8::HandleScope scope(isolate);
             second_callback(callback_info);