Attachment 338762 Details for Bug 184891 – Patch

[patch] Patch

bug-184891-20180425112541.patch (text/plain), 3.23 KB, created by Ross Kirsling on 2018-04-25 11:25:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-04-25 11:25:43 PDT

Size: 3.23 KB

patch

obsolete

>Subversion Revision: 231000
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index c95a4dadd730333809af2fb38a9cb3351e226e57..9cf528a9019e63f03ba9fcbc9bbf9b8ff7576172 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-04-25  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [WinCairo] Fix js/regexp-unicode.html crash.
>+        https://bugs.webkit.org/show_bug.cgi?id=184891
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        On Win64, register RDI is "considered nonvolatile and must be saved and restored by a function that uses [it]".
>+        RDI is being used as a scratch register for JIT_UNICODE_EXPRESSIONS, not just YARR_JIT_ALL_PARENS_EXPRESSIONS.
>+
>+        * yarr/YarrJIT.cpp:
>+        (JSC::Yarr::YarrGenerator::generateEnter):
>+        (JSC::Yarr::YarrGenerator::generateReturn):
>+        Unconditionally save and restore RDI on 64-bit Windows.
>+
> 2018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [GTK] Miscellaneous build cleanups
>diff --git a/Source/JavaScriptCore/yarr/YarrJIT.cpp b/Source/JavaScriptCore/yarr/YarrJIT.cpp
>index ab70f6d9cb3ddb3c1c9c46eb4d0fc71dfa9fe05a..26fcd69d0b0cb225030c0ffb128b5b66cd7c444d 100644
>--- a/Source/JavaScriptCore/yarr/YarrJIT.cpp
>+++ b/Source/JavaScriptCore/yarr/YarrJIT.cpp
>@@ -3299,10 +3299,12 @@ class YarrGenerator : private MacroAssembler {
>         if (m_pattern.m_saveInitialStartValue)
>             push(X86Registers::ebx);
> 
>+#if OS(WINDOWS)
>+        push(X86Registers::edi);
>+#endif
> #if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
>         if (m_containsNestedSubpatterns) {
> #if OS(WINDOWS)
>-            push(X86Registers::edi);
>             push(X86Registers::esi);
> #endif
>             push(X86Registers::r12);
>@@ -3392,10 +3394,12 @@ class YarrGenerator : private MacroAssembler {
>             pop(X86Registers::r12);
> #if OS(WINDOWS)
>             pop(X86Registers::esi);
>-            pop(X86Registers::edi);
> #endif
>         }
> #endif
>+#if OS(WINDOWS)
>+        pop(X86Registers::edi);
>+#endif
> 
>         if (m_pattern.m_saveInitialStartValue)
>             pop(X86Registers::ebx);
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index d1cee80eb07869be8d71a7ace048889634ff4bfe..b06b4db9eb1f5ee8b9728ba7a24fd848ebf08be4 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-04-25  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [WinCairo] Fix js/regexp-unicode.html crash.
>+        https://bugs.webkit.org/show_bug.cgi?id=184891
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/wincairo/TestExpectations:
>+
> 2018-04-25  Youenn Fablet  <youenn@apple.com>
> 
>         Make DocumentThreadableLoader error logging more consistent
>diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations
>index 8cc93f3a7b67c028fba904d2a7b811d434beea19..dd6374799e49ea997fd455f9de66b38ef2261f67 100644
>--- a/LayoutTests/platform/wincairo/TestExpectations
>+++ b/LayoutTests/platform/wincairo/TestExpectations
>@@ -1525,7 +1525,6 @@ imported/blink [ Skip ]
> imported/mozilla [ Skip ]
> imported/w3c [ Skip ]
> inspector [ Skip ]
>-js/regexp-unicode.html [ Skip ]
> js/dom [ Skip ]
> legacy-animation-engine/media [ Skip ]
> legacy-animation-engine/transitions [ Skip ]

Actions: View | Formatted Diff | Diff

Attachments on bug 184891: 338594 | 338762