Changeset 289417 in webkit for trunk/Source/JavaScriptCore/builtins

Timestamp:

Feb 8, 2022, 12:42:04 PM (3 years ago)

Author:

[email protected]

Message:

[JSC] move function wrapping logic to a new Function type
​https://bugs.webkit.org/show_bug.cgi?id=235382

Reviewed by Yusuke Suzuki.

JSTests:

Adds a new file testing CopyNameAndLength stuff in the ShadowRealm proposal,
and fix up assertions about this in shadow-realm-evaluate.js

• stress/shadow-realm-evaluate.js:
• stress/shadow-realm-remote-function-copy-length-and-name.js: Added.

Source/JavaScriptCore:

In this initial patch, there is still a lot of JS-builtin machinery,
including some duplicated functionality. Additionally, JIT support
has not been incorporated yet.

Broadly, the idea is that there are custom hooks for calling a
JSRemoteFunction, which perform the wrapping functionality. This avoids
the need for allocating closures which contain the wrapping logic.

TODO:

• JIT/DFG/FTL support
• structure caching (unnecessary since these are not constructors?)
• improved baseline perf

• CMakeLists.txt:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Sources.txt:
• assembler/LinkBuffer.h:
• builtins/BuiltinNames.h:
• builtins/ShadowRealmPrototype.js:
• bytecode/LinkTimeConstant.h:
• dfg/DFGSpeculativeJIT.cpp:
• ftl/FTLLowerDFGToB3.cpp:
• heap/Heap.cpp:
• heap/Heap.h:
• inspector/JSInjectedScriptHost.cpp:
• interpreter/Interpreter.cpp:
• jit/AssemblyHelpers.h:
• jit/JITOperations.cpp:
• jit/JITOperations.h:
• jit/ThunkGenerators.cpp:
• jit/ThunkGenerators.h:
• jsc.cpp:
• runtime/ErrorInstance.cpp:
• runtime/FunctionPrototype.cpp:
• runtime/InternalFunction.cpp:
• runtime/Intrinsic.cpp:
• runtime/Intrinsic.h:
• runtime/JSCast.h:
• runtime/JSFunction.cpp:
• runtime/JSFunction.h:
• runtime/JSFunctionInlines.h:
• runtime/JSGlobalObject.cpp:
• runtime/JSGlobalObject.h:
• runtime/JSRemoteFunction.cpp: Added.
• runtime/JSRemoteFunction.h: Added.
• runtime/VM.cpp:
• runtime/VM.h:

Location:

trunk/Source/JavaScriptCore/builtins

Files:

• BuiltinNames.h (modified) (1 diff)
• ShadowRealmPrototype.js (modified) (1 diff)

trunk/Source/JavaScriptCore/builtins/BuiltinNames.h

@@ -190 +190 @@
     macro(emptyPropertyNameEnumerator) \
     macro(sentinelString) \
+    macro(createRemoteFunction) \
+    macro(isRemoteFunction) \
 
 

trunk/Source/JavaScriptCore/builtins/ShadowRealmPrototype.js

@@ -33 +33 @@
 
     if (@isCallable(target)) {
-        var wrapped = function(/* args... */) {
-            var length = arguments.length;
-            var wrappedArgs = @newArrayWithSize(length);
-            for (var index = 0; index < length; ++index)
-                // Note that for arguments, we flip `fromShadowRealm` since to
-                // wrap a function from realm A to work in realm B, we need to
-                // wrap the arguments (from realm B) to work in realm A before
-                // calling the wrapped function
-                @putByValDirect(wrappedArgs, index, @wrap(!fromShadowRealm, shadowRealm, arguments[index]));
-
-            try {
-                var result = target.@apply(@undefined, wrappedArgs);
-            } catch (e) {
-                const msg = "wrapped function threw: " + e.toString();
-                if (fromShadowRealm)
-                    @throwTypeError(msg);
-                else {
-                    const mkTypeError = @evalInRealm(shadowRealm, "(msg) => new TypeError(msg)");
-                    const err = mkTypeError.@apply(msg);
-                    throw err;
-                }
-            }
-            return @wrap(fromShadowRealm, shadowRealm, result);
-        };
-        delete wrapped['name'];
-        delete wrapped['length'];
-
-        // Because this function (wrap) will run with the incubating realm
-        // active, we only need to fix the prototype on `wrapped` if we are
-        // moving the function from the incubating realm to the shadow realm
-        if (!fromShadowRealm)
-            @moveFunctionToRealm(wrapped, shadowRealm);
-        return wrapped;
+        return @createRemoteFunction(target, fromShadowRealm ? null : shadowRealm);
     } else if (@isObject(target)) {
         @throwTypeError("value passing between realms must be callable or primitive");