Title: [230776] trunk/Source/_javascript_Core
Revision
230776
Author
[email protected]
Date
2018-04-18 13:19:55 -0700 (Wed, 18 Apr 2018)

Log Message

REGRESSION(r230748) [WinCairo] 'JSC::JIT::appendCallWithSlowPathReturnType': function does not take 1 arguments
https://bugs.webkit.org/show_bug.cgi?id=184725

Reviewed by Mark Lam.

* jit/JIT.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (230775 => 230776)


--- trunk/Source/_javascript_Core/ChangeLog	2018-04-18 20:13:44 UTC (rev 230775)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-04-18 20:19:55 UTC (rev 230776)
@@ -1,3 +1,12 @@
+2018-04-18  Ross Kirsling  <[email protected]>
+
+        REGRESSION(r230748) [WinCairo] 'JSC::JIT::appendCallWithSlowPathReturnType': function does not take 1 arguments
+        https://bugs.webkit.org/show_bug.cgi?id=184725
+
+        Reviewed by Mark Lam.
+
+        * jit/JIT.h:
+
 2018-04-18  Yusuke Suzuki  <[email protected]>
 
         [WebAssembly][Modules] Import tables in wasm modules

Modified: trunk/Source/_javascript_Core/jit/JIT.h (230775 => 230776)


--- trunk/Source/_javascript_Core/jit/JIT.h	2018-04-18 20:13:44 UTC (rev 230775)
+++ trunk/Source/_javascript_Core/jit/JIT.h	2018-04-18 20:19:55 UTC (rev 230776)
@@ -275,9 +275,9 @@
         }
 
 #if OS(WINDOWS) && CPU(X86_64)
-        Call appendCallWithSlowPathReturnType(const FunctionPtr<CFunctionPtrTag> function, PtrTag tag)
+        Call appendCallWithSlowPathReturnType(const FunctionPtr<CFunctionPtrTag> function)
         {
-            Call functionCall = callWithSlowPathReturnType(tag);
+            Call functionCall = callWithSlowPathReturnType(OperationPtrTag);
             m_calls.append(CallRecord(functionCall, m_bytecodeOffset, function.retagged<OperationPtrTag>()));
             return functionCall;
         }
@@ -733,6 +733,14 @@
         }
 
 #if OS(WINDOWS) && CPU(X86_64)
+        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)
+        {
+            setupArguments<OperationType>(args...);
+            return appendCallWithExceptionCheckAndSlowPathReturnType(operation);
+        }
+
         template<typename Type>
         static constexpr bool is64BitType() { return sizeof(Type) <= 8; }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to