Changeset 260346 in webkit

Timestamp:

Apr 19, 2020 6:56:24 PM (4 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] SlowPathCall is not supported by callOperation in Windows
​https://bugs.webkit.org/show_bug.cgi?id=210727

Reviewed by Ross Kirsling.

In Windows, SlowPathCall should be handled by JITSlowPathCall, otherwise, stack is not correctly allocated.

• jit/JITCall.cpp:

(JSC::JIT::emit_op_iterator_open):
(JSC::JIT::emit_op_iterator_next):

• jit/SlowPathCall.h:

(JSC::JITSlowPathCall::call):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITCall.cpp (modified) (2 diffs)
• jit/SlowPathCall.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-04-19  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] SlowPathCall is not supported by callOperation in Windows
+        https://bugs.webkit.org/show_bug.cgi?id=210727
+
+        Reviewed by Ross Kirsling.
+
+        In Windows, SlowPathCall should be handled by JITSlowPathCall, otherwise, stack is not correctly allocated.
+
+        * jit/JITCall.cpp:
+        (JSC::JIT::emit_op_iterator_open):
+        (JSC::JIT::emit_op_iterator_next):
+        * jit/SlowPathCall.h:
+        (JSC::JITSlowPathCall::call):
+
 2020-04-19  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/jit/JITCall.cpp

@@ -394 +394 @@
         }
     })();
-    setupArguments<decltype(tryFastFunction)>(instruction);
-    appendCallWithExceptionCheck(tryFastFunction);
+
+    JITSlowPathCall slowPathCall(this, instruction, tryFastFunction);
+    slowPathCall.call();
     Jump fastCase = branch32(NotEqual, GPRInfo::returnValueGPR2, TrustedImm32(static_cast<uint32_t>(IterationMode::Generic)));
 
@@ -455 +456 @@
     emitGetVirtualRegister(bytecode.m_next, regT0);
     Jump genericCase = branchIfNotEmpty(regT0);
-    setupArguments<decltype(tryFastFunction)>(instruction);
-    appendCallWithExceptionCheck(tryFastFunction);
+
+    JITSlowPathCall slowPathCall(this, instruction, tryFastFunction);
+    slowPathCall.call();
     Jump fastCase = branch32(NotEqual, GPRInfo::returnValueGPR2, TrustedImm32(static_cast<uint32_t>(IterationMode::Generic)));
 

trunk/Source/JavaScriptCore/jit/SlowPathCall.h

@@ -65 +65 @@
         m_jit->pop(JIT::regT0); // vPC
         m_jit->pop(JIT::regT1); // callFrame register
+        static_assert(JIT::regT0 == GPRInfo::returnValueGPR);
+        static_assert(JIT::regT1 == GPRInfo::returnValueGPR2);
 #endif