Title: [282221] trunk/Source
Revision
282221
Author
pan...@apple.com
Date
2021-09-09 10:02:27 -0700 (Thu, 09 Sep 2021)

Log Message

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

Reviewed by Alex Christensen.

Source/_javascript_Core:

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:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (282220 => 282221)


--- trunk/Source/_javascript_Core/ChangeLog	2021-09-09 16:49:51 UTC (rev 282220)
+++ trunk/Source/_javascript_Core/ChangeLog	2021-09-09 17:02:27 UTC (rev 282221)
@@ -1,3 +1,18 @@
+2021-09-09  Patrick Angle  <pan...@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_mich...@apple.com>
 
         Differential testing: incorrect constant propagation around Uint8ClampedArray

Modified: trunk/Source/_javascript_Core/runtime/SymbolStubsForSafariCompatibility.mm (282220 => 282221)


--- trunk/Source/_javascript_Core/runtime/SymbolStubsForSafariCompatibility.mm	2021-09-09 16:49:51 UTC (rev 282220)
+++ trunk/Source/_javascript_Core/runtime/SymbolStubsForSafariCompatibility.mm	2021-09-09 17:02:27 UTC (rev 282221)
@@ -37,6 +37,7 @@
 
 template<typename, typename> class RefPtr { };
 template<typename> struct DumbPtrTraits { };
+template<typename> class Optional { };
 
 namespace JSONImpl {
 class Array { };
@@ -57,9 +58,13 @@
 namespace Inspector {
 
 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
 

Modified: trunk/Source/WTF/ChangeLog (282220 => 282221)


--- trunk/Source/WTF/ChangeLog	2021-09-09 16:49:51 UTC (rev 282220)
+++ trunk/Source/WTF/ChangeLog	2021-09-09 17:02:27 UTC (rev 282221)
@@ -1,3 +1,15 @@
+2021-09-09  Patrick Angle  <pan...@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  <j...@apple.com>
 
         Safari TP 131 audio canPlayType() reports false negatives

Modified: trunk/Source/WTF/wtf/PlatformHave.h (282220 => 282221)


--- trunk/Source/WTF/wtf/PlatformHave.h	2021-09-09 16:49:51 UTC (rev 282220)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2021-09-09 17:02:27 UTC (rev 282221)
@@ -457,7 +457,7 @@
 #define HAVE_CFNETWORK_METRICS_CONNECTION_PROPERTIES 1
 #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
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to