Title: [254599] branches/safari-609-branch/Source/WebKit
Revision
254599
Author
alanc...@apple.com
Date
2020-01-15 11:15:13 -0800 (Wed, 15 Jan 2020)

Log Message

Cherry-pick r254208. rdar://problem/58559193

    IPC::Connection::sendMessage() should use CRASH_WITH_INFO()
    <https://webkit.org/b/205419>
    <rdar://problem/58058661>

    Reviewed by Mark Lam.

    * Platform/IPC/cocoa/ConnectionCocoa.mm:
    (IPC::Connection::sendMessage):
    - Switch from CRASH() to CRASH_WITH_INFO().

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (254598 => 254599)


--- branches/safari-609-branch/Source/WebKit/ChangeLog	2020-01-15 19:15:10 UTC (rev 254598)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog	2020-01-15 19:15:13 UTC (rev 254599)
@@ -1,5 +1,34 @@
 2020-01-14  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r254208. rdar://problem/58559193
+
+    IPC::Connection::sendMessage() should use CRASH_WITH_INFO()
+    <https://webkit.org/b/205419>
+    <rdar://problem/58058661>
+    
+    Reviewed by Mark Lam.
+    
+    * Platform/IPC/cocoa/ConnectionCocoa.mm:
+    (IPC::Connection::sendMessage):
+    - Switch from CRASH() to CRASH_WITH_INFO().
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254208 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-08  David Kilzer  <ddkil...@apple.com>
+
+            IPC::Connection::sendMessage() should use CRASH_WITH_INFO()
+            <https://webkit.org/b/205419>
+            <rdar://problem/58058661>
+
+            Reviewed by Mark Lam.
+
+            * Platform/IPC/cocoa/ConnectionCocoa.mm:
+            (IPC::Connection::sendMessage):
+            - Switch from CRASH() to CRASH_WITH_INFO().
+
+2020-01-14  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r254147. rdar://problem/58549096
 
     Reformat WebFrameLoaderClient logging

Modified: branches/safari-609-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm (254598 => 254599)


--- branches/safari-609-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm	2020-01-15 19:15:10 UTC (rev 254598)
+++ branches/safari-609-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm	2020-01-15 19:15:13 UTC (rev 254599)
@@ -39,6 +39,7 @@
 #import <wtf/MachSendRight.h>
 #import <wtf/RunLoop.h>
 #import <wtf/spi/darwin/XPCSPI.h>
+#import <wtf/text/StringConcatenate.h>
 
 #if PLATFORM(IOS_FAMILY)
 #import "ProcessAssertion.h"
@@ -272,8 +273,9 @@
         return false;
 
     default:
-        WebKit::setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x, message '%s::%s'", kr, message->messageReceiverName().data(), message->messageName().data()]);
-        CRASH();
+        CString messageName = makeString(message->messageReceiverName().data(), "::", message->messageName().data()).utf8();
+        WebKit::setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x, message '%s', hash %d", kr, messageName.data(), messageName.hash()]);
+        CRASH_WITH_INFO(kr, messageName.hash());
     }
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to