From b787bbee6be3dce131f3058e630276b65b9355bf Mon Sep 17 00:00:00 2001
From: Alexey Martemyanov <mallexxx@gmail.com>
Date: Fri, 2 Aug 2024 15:21:37 +0600
Subject: [PATCH] restore CrashLogMessageExtractor with disabled __cxa_throw
 swapper (#3133)

Task/Issue URL: https://app.asana.com/0/414709148257752/1207878606354585/f
BSK PR: https://github.com/duckduckgo/BrowserServicesKit/pull/909
macOS PR: https://github.com/duckduckgo/macos-browser/pull/3011
---
 DuckDuckGo.xcodeproj/project.pbxproj                        | 2 +-
 .../xcshareddata/swiftpm/Package.resolved                   | 4 ++--
 DuckDuckGo/AppDelegate.swift                                | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index d7cfce8efa..cd893c6946 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -10206,7 +10206,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 176.1.1;
+				version = "176.1.1-1";
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 67fa8421c6..0b740e8f12 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "a3e62d6c295063f757ef7dc2f96b6a57a503f0f5",
-        "version" : "176.1.1"
+        "revision" : "7325384a51085d470607427e4555acc3d0fba1a6",
+        "version" : "176.1.1-1"
       }
     },
     {
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
index 1d84119be4..3111c1461b 100644
--- a/DuckDuckGo/AppDelegate.swift
+++ b/DuckDuckGo/AppDelegate.swift
@@ -100,6 +100,12 @@ import WebKit
 
     override init() {
         super.init()
+
+        if !didCrashDuringCrashHandlersSetUp {
+            didCrashDuringCrashHandlersSetUp = true
+            CrashLogMessageExtractor.setUp(swapCxaThrow: false)
+            didCrashDuringCrashHandlersSetUp = false
+        }
     }
 
     // swiftlint:disable:next function_body_length