Attachment 342563 Details for Bug 186567 – patch for landing w/ iOS sim build fix.

[patch] patch for landing w/ iOS sim build fix.

bug-186567.patch (text/plain), 3.37 KB, created by Mark Lam on 2018-06-12 11:12:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Lam

Created: 2018-06-12 11:12:52 PDT

Size: 3.37 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 232757)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-06-12  Mark Lam  <mark.lam@apple.com>
>+
>+        FloatingPointEnvironment is only needed for ARM CPUs.
>+        https://bugs.webkit.org/show_bug.cgi?id=186567
>+        <rdar://problem/40929441>
>+
>+        Reviewed by Michael Saboff.
>+
>+        No new tests.  This behavior is already covered by existing tests.
>+
>+        * platform/ios/wak/FloatingPointEnvironment.cpp:
>+        * platform/ios/wak/FloatingPointEnvironment.h:
>+        (WebCore::FloatingPointEnvironment::enableDenormalSupport):
>+        (WebCore::FloatingPointEnvironment::saveMainThreadEnvironment):
>+        (WebCore::FloatingPointEnvironment::propagateMainThreadEnvironment):
>+        (WebCore::FloatingPointEnvironment::singleton):
>+
> 2018-06-12  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         REGRESSION(r228724): Occasional crash when executing ReplaceSelectionCommand at the end of the document
>Index: Source/WebCore/platform/ios/wak/FloatingPointEnvironment.cpp
>===================================================================
>--- Source/WebCore/platform/ios/wak/FloatingPointEnvironment.cpp	(revision 232757)
>+++ Source/WebCore/platform/ios/wak/FloatingPointEnvironment.cpp	(working copy)
>@@ -29,8 +29,6 @@
> #include <wtf/MainThread.h>
> #include <wtf/NeverDestroyed.h>
> 
>-#if PLATFORM(IOS)
>-
> namespace WebCore {
> 
> FloatingPointEnvironment& FloatingPointEnvironment::singleton()
>@@ -39,6 +37,8 @@ FloatingPointEnvironment& FloatingPointE
>     return floatingPointEnvironment;
> }
> 
>+#if PLATFORM(IOS) && (CPU(ARM) || CPU(ARM64))
>+
> FloatingPointEnvironment::FloatingPointEnvironment()
>     : m_isInitialized(false)
> {
>@@ -48,7 +48,7 @@ void FloatingPointEnvironment::enableDen
> {
>     RELEASE_ASSERT(isUIThread());
> #if defined _ARM_ARCH_7
>-    fenv_t env; 
>+    fenv_t env;
>     fegetenv(&env); 
>     env.__fpscr &= ~0x01000000U;
>     fesetenv(&env); 
>@@ -71,6 +71,6 @@ void FloatingPointEnvironment::propagate
>     fesetenv(&m_mainThreadEnvironment);
> }
> 
>-} // namespace WebCore
>+#endif // PLATFORM(IOS) && (CPU(ARM) || CPU(ARM64))
> 
>-#endif // PLATFORM(IOS)
>+} // namespace WebCore
>Index: Source/WebCore/platform/ios/wak/FloatingPointEnvironment.h
>===================================================================
>--- Source/WebCore/platform/ios/wak/FloatingPointEnvironment.h	(revision 232757)
>+++ Source/WebCore/platform/ios/wak/FloatingPointEnvironment.h	(working copy)
>@@ -26,12 +26,12 @@
> #ifndef FloatingPointEnvironment_h
> #define FloatingPointEnvironment_h
> 
>-#if TARGET_OS_IPHONE
>-
> #import <fenv.h>
> 
> namespace WebCore {
> 
>+#if PLATFORM(IOS) && (CPU(ARM) || CPU(ARM64))
>+
> class FloatingPointEnvironment {
> public:
>     FloatingPointEnvironment();
>@@ -48,11 +48,22 @@ private:
>     bool m_isInitialized;
> };
> 
>+#else // not PLATFORM(IOS) && (CPU(ARM) || CPU(ARM64))
>+
>+class FloatingPointEnvironment {
>+public:
>+    FloatingPointEnvironment() = default;
>+    void enableDenormalSupport() { }
>+    void saveMainThreadEnvironment() { }
>+    void propagateMainThreadEnvironment() { }
>+    static FloatingPointEnvironment& singleton();
>+};
>+
>+#endif // PLATFORM(IOS) && (CPU(ARM) || CPU(ARM64))
>+
> } // namespace WebCore
> 
> using WebCore::FloatingPointEnvironment;
> 
>-#endif // TARGET_OS_IPHONE
>-
> #endif // FloatingPointEnvironment_h
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186567: 342557 | 342563 | 342572 | 342642