Changeset 282221 in webkit

Timestamp:

Sep 9, 2021, 10:02:27 AM (5 years ago)

Author:

Patrick Angle

Message:

run-webkit-archive crashes with dyld error
​https://bugs.webkit.org/show_bug.cgi?id=228060

Reviewed by Alex Christensen.

Source/JavaScriptCore:

Add a compatibility symbol for the old WTF::Optional version of BackendDispatcher::reportProtocolError in
versions of Safari shipping with macOS Big Sur and earlier. This has the side effect of not surfacing protocol
errors and instead silently discarding them when crossing this API boundary. Newer versions of macOS ship using
the newer symbol and are therefor not affected and will continue to surface protocol errors to the frontend.

• runtime/SymbolStubsForSafariCompatibility.mm:

(Inspector::BackendDispatcher::reportProtocolError):

Source/WTF:

Bump the maximum macOS version that HAVE_SAFARI_FOR_WEBKIT_DEVELOPMENT_REQUIRING_EXTRA_SYMBOLS will be enabled
to provide compatibility with changes made in macOS 12.

• wtf/PlatformHave.h:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/SymbolStubsForSafariCompatibility.mm (modified) (2 diffs)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-09-09  Patrick Angle  <pangle@apple.com>
+
+        run-webkit-archive crashes with dyld error
+        https://bugs.webkit.org/show_bug.cgi?id=228060
+
+        Reviewed by Alex Christensen.
+
+        Add a compatibility symbol for the old `WTF::Optional` version of `BackendDispatcher::reportProtocolError` in
+        versions of Safari shipping with macOS Big Sur and earlier. This has the side effect of not surfacing protocol
+        errors and instead silently discarding them when crossing this API boundary. Newer versions of macOS ship using
+        the newer symbol and are therefor not affected and will continue to surface protocol errors to the frontend.
+
+        * runtime/SymbolStubsForSafariCompatibility.mm:
+        (Inspector::BackendDispatcher::reportProtocolError):
+
 2021-09-09  Justin Michaud  <justin_michaud@apple.com>
 

trunk/Source/JavaScriptCore/runtime/SymbolStubsForSafariCompatibility.mm

@@ -38 +38 @@
 template<typename, typename> class RefPtr { };
 template<typename> struct DumbPtrTraits { };
+template<typename> class Optional { };
 
 namespace JSONImpl {
@@ -58 +59 @@
 
 class BackendDispatcher {
+    enum CommonErrorCode { NotUsed };
+
     JS_EXPORT_PRIVATE void sendResponse(long, WTF::RefPtr<WTF::JSONImpl::Object, WTF::DumbPtrTraits<WTF::JSONImpl::Object>>&&, bool);
+    JS_EXPORT_PRIVATE void reportProtocolError(WTF::Optional<long>, CommonErrorCode, const WTF::String&);
 };
 void BackendDispatcher::sendResponse(long, WTF::RefPtr<WTF::JSONImpl::Object, WTF::DumbPtrTraits<WTF::JSONImpl::Object>>&&, bool) { }
+void BackendDispatcher::reportProtocolError(WTF::Optional<long>, CommonErrorCode, const WTF::String&) { }
 
 } // namespace Inspector

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-09-09  Patrick Angle  <pangle@apple.com>
+
+        run-webkit-archive crashes with dyld error
+        https://bugs.webkit.org/show_bug.cgi?id=228060
+
+        Reviewed by Alex Christensen.
+
+        Bump the maximum macOS version that `HAVE_SAFARI_FOR_WEBKIT_DEVELOPMENT_REQUIRING_EXTRA_SYMBOLS` will be enabled
+        to provide compatibility with changes made in macOS 12.
+
+        * wtf/PlatformHave.h:
+
 2021-09-08  Jean-Yves Avenard  <jya@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -458 +458 @@
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 110300
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000
 #define HAVE_SAFARI_FOR_WEBKIT_DEVELOPMENT_REQUIRING_EXTRA_SYMBOLS 1
 #endif