Changeset 276486 in webkit

Timestamp:

Apr 22, 2021, 10:16:59 PM (5 years ago)

Author:

Fujii Hironori

Message:

[JSC][Win] callOperationNoExceptionCheck() also needs to support operations that return SlowPathReturnType
​https://bugs.webkit.org/show_bug.cgi?id=224964

Reviewed by Yusuke Suzuki.

r229989 (Bug 183655) added the x64 Windows support only for
callOperation(), but for callOperationNoExceptionCheck().
callOperationNoExceptionCheck() also needs the x64 Windows
support.

This change is a preparation for Bug 224920 that is going to use
callOperationNoExceptionCheck instead of callOperation.

• jit/JIT.h:

(callOperation): Rewrote by using 'if constexpr' instead of SFINAE.
(callOperationNoExceptionCheck): Added a new implementation for
x64 Windows based on callOperation.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JIT.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-04-22  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [JSC][Win] callOperationNoExceptionCheck() also needs to support operations that return SlowPathReturnType
+        https://bugs.webkit.org/show_bug.cgi?id=224964
+
+        Reviewed by Yusuke Suzuki.
+
+        r229989 (Bug 183655) added the x64 Windows support only for
+        callOperation(), but for callOperationNoExceptionCheck().
+        callOperationNoExceptionCheck() also needs the x64 Windows
+        support.
+
+        This change is a preparation for Bug 224920 that is going to use
+        callOperationNoExceptionCheck instead of callOperation.
+
+        * jit/JIT.h:
+        (callOperation): Rewrote by using 'if constexpr' instead of SFINAE.
+        (callOperationNoExceptionCheck): Added a new implementation for
+        x64 Windows based on callOperation.
+
 2021-04-22  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -825 +825 @@
 
 #if OS(WINDOWS) && CPU(X86_64)
+        template<typename Type> static constexpr bool is64BitType = sizeof(Type) <= 8;
+        template<> static constexpr bool is64BitType<void> = true;
+
         template<typename OperationType, typename... Args>
-        std::enable_if_t<std::is_same<typename FunctionTraits<OperationType>::ResultType, SlowPathReturnType>::value, MacroAssembler::Call>
-        callOperation(OperationType operation, Args... args)
+        MacroAssembler::Call callOperation(OperationType operation, Args... args)
         {
             setupArguments<OperationType>(args...);
+            // x64 Windows cannot use standard call when the return type is larger than 64 bits.
+            if constexpr (is64BitType<typename FunctionTraits<OperationType>::ResultType>)
+                return appendCallWithExceptionCheck(operation);
             return appendCallWithExceptionCheckAndSlowPathReturnType(operation);
-        }
-
-        template<typename Type>
-        struct is64BitType {
-            static constexpr bool value = sizeof(Type) <= 8;
-        };
-
-        template<>
-        struct is64BitType<void> {
-            static constexpr bool value = true;
-        };
-
-        template<typename OperationType, typename... Args>
-        std::enable_if_t<!std::is_same<typename FunctionTraits<OperationType>::ResultType, SlowPathReturnType>::value, MacroAssembler::Call>
-        callOperation(OperationType operation, Args... args)
-        {
-            static_assert(is64BitType<typename FunctionTraits<OperationType>::ResultType>::value, "Win64 cannot use standard call when return type is larger than 64 bits.");
-            setupArguments<OperationType>(args...);
-            return appendCallWithExceptionCheck(operation);
         }
 #else // OS(WINDOWS) && CPU(X86_64)
@@ -877 +863 @@
         }
 
+#if OS(WINDOWS) && CPU(X86_64)
+        template<typename OperationType, typename... Args>
+        MacroAssembler::Call callOperationNoExceptionCheck(OperationType operation, Args... args)
+        {
+            setupArguments<OperationType>(args...);
+            updateTopCallFrame();
+            // x64 Windows cannot use standard call when the return type is larger than 64 bits.
+            if constexpr (is64BitType<typename FunctionTraits<OperationType>::ResultType>)
+                return appendCall(operation);
+            return appendCallWithSlowPathReturnType(operation);
+        }
+#else
         template<typename OperationType, typename... Args>
         MacroAssembler::Call callOperationNoExceptionCheck(OperationType operation, Args... args)
@@ -884 +882 @@
             return appendCall(operation);
         }
+#endif // OS(WINDOWS) && CPU(X86_64)
 
         template<typename OperationType, typename... Args>