Changeset 158922 in webkit

Timestamp:

Nov 8, 2013 9:12:27 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[Win] JavaScript crash in getHostCallReturnValue.
​https://bugs.webkit.org/show_bug.cgi?id=124040

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2013-11-08
Reviewed by Geoffrey Garen.

• jit/JITOperations.cpp: Update MSVC assembler code in getHostCallReturnValue according to gcc x86 version.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITOperations.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-11-08  peavo@outlook.com  <peavo@outlook.com>
+
+        [Win] JavaScript crash in getHostCallReturnValue.
+        https://bugs.webkit.org/show_bug.cgi?id=124040
+
+        Reviewed by Geoffrey Garen.
+
+        * jit/JITOperations.cpp: Update MSVC assembler code in getHostCallReturnValue according to gcc x86 version.
+
 2013-11-08  Julien Brianceau  <jbriance@cisco.com>
 

trunk/Source/JavaScriptCore/jit/JITOperations.cpp

@@ -1803 +1803 @@
     __declspec(naked) EncodedJSValue HOST_CALL_RETURN_VALUE_OPTION getHostCallReturnValue()
     {
-        __asm {
-            mov edi, [edi + 0]; // CallerFrameAndPC::callerFrame
-            mov [esp + 4], edi;
-            jmp getHostCallReturnValueWithExecState
-        }
+        __asm mov ebp, [ebp + 0]; // CallerFrameAndPC::callerFrame
+        __asm mov [esp + 4], ebp;
+        __asm jmp getHostCallReturnValueWithExecState
     }
 }