Changeset 278687 in webkit

Timestamp:

Jun 9, 2021, 6:32:37 PM (5 years ago)

Author:

Fujii Hironori

Message:

clang-cl: JIT.h(966,67): error: no viable conversion from 'JSC::AbstractMacroAssembler<JSC::X86Assembler>::Address' to 'FunctionPtr<CFunctionPtrTag>'
​https://bugs.webkit.org/show_bug.cgi?id=226850

Reviewed by Yusuke Suzuki.

WinCairo clang-cl builds got broken since r278656 (Bug 226072).

• jit/JIT.h: Use the common callOperation(Address, Args...) for

x64 Windows. Added static_assert to check the return type.

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-06-09  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        clang-cl: JIT.h(966,67): error: no viable conversion from 'JSC::AbstractMacroAssembler<JSC::X86Assembler>::Address' to 'FunctionPtr<CFunctionPtrTag>'
+        https://bugs.webkit.org/show_bug.cgi?id=226850
+
+        Reviewed by Yusuke Suzuki.
+
+        WinCairo clang-cl builds got broken since r278656 (Bug 226072).
+
+        * jit/JIT.h: Use the common callOperation(Address, Args...) for
+        x64 Windows. Added static_assert to check the return type.
+
 2021-06-09  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -955 +955 @@
             return appendCallWithExceptionCheckAndSlowPathReturnType(operation);
         }
-
-        template<typename OperationType, typename... Args>
-        void callOperation(Address target, Args... args)
-        {
-            setupArgumentsForIndirectCall<OperationType>(target, args...);
-            // x64 Windows cannot use standard call when the return type is larger than 64 bits.
-            if constexpr (is64BitType<typename FunctionTraits<OperationType>::ResultType>::value)
-                appendCallWithExceptionCheck(Address(GPRInfo::nonArgGPR0, target.offset));
-            else
-                appendCallWithExceptionCheckAndSlowPathReturnType(Address(GPRInfo::nonArgGPR0, target.offset));
-        }
 #else // OS(WINDOWS) && CPU(X86_64)
         template<typename OperationType, typename... Args>
@@ -973 +962 @@
             return appendCallWithExceptionCheck(operation);
         }
+#endif // OS(WINDOWS) && CPU(X86_64)
 
         template<typename OperationType, typename... Args>
         void callOperation(Address target, Args... args)
         {
+#if OS(WINDOWS) && CPU(X86_64)
+            // x64 Windows cannot use standard call when the return type is larger than 64 bits.
+            static_assert(is64BitType<typename FunctionTraits<OperationType>::ResultType>::value);
+#endif
             setupArgumentsForIndirectCall<OperationType>(target, args...);
             appendCallWithExceptionCheck(Address(GPRInfo::nonArgGPR0, target.offset));
         }
-#endif // OS(WINDOWS) && CPU(X86_64)
 
         template<typename Metadata, typename OperationType, typename... Args>