Removes internal files used for swift demangling and replaces with package dependency on swift-demangling

.gitignore

@@ -1,3 +1,4 @@
+.build/
 build/*
 KSCrash/build/*
 *.pbxuser

Package.resolved

@@ -0,0 +1,14 @@
+{
+ "pins" : [
+ {
+ "identity" : "swift-demangler",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/embrace-io/swift-demangler.git",
+ "state" : {
+ "branch" : "main",
+ "revision" : "602376930d19d1f21ef6501dceede8b1143ab9f9"
+ }
+ }
+ ],
+ "version" : 2
+}

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.7
 
 import PackageDescription
 
@@ -15,12 +15,15 @@ let package = Package(
  "KSCrash/Reporting/Filters",
  "KSCrash/Reporting/Filters/Tools",
  "KSCrash/Reporting/Tools",
- "KSCrash/Reporting/Sinks",
- "KSCrash/swift/Basic"
+ "KSCrash/Reporting/Sinks"
  ]
  )
  ],
  dependencies: [
+ .package(
+ url: "https://github.com/embrace-io/swift-demangler.git",
+ branch: "main"
+ ),
  ],
  targets: [
  .target(
@@ -63,6 +66,9 @@ let package = Package(
  ),
  .target(
  name: "KSCrash/Recording/Tools",
+ dependencies: [
+ .product(name: "AppleSwiftDemangling", package: "swift-demangler")
+ ],
  path: "Source/KSCrash/Recording/Tools",
  publicHeadersPath: ".",
  cxxSettings: [
@@ -117,17 +123,6 @@ let package = Package(
  .headerSearchPath("../../Recording/Tools"),
  .headerSearchPath("../../Recording/Monitors")
  ]
- ),
- .target(
- name: "KSCrash/swift/Basic",
- path: "Source/KSCrash/swift/Basic",
- publicHeadersPath: ".",
- cxxSettings: [
- .headerSearchPath(".."),
- .headerSearchPath("../../llvm/ADT"),
- .headerSearchPath("../../llvm/Config"),
- .headerSearchPath("../../llvm/Support")
- ]
  )
  ],
  cxxLanguageStandard: .gnucxx11

Source/KSCrash/Recording/Tools/KSDemangle_Swift.cpp

@@ -25,16 +25,10 @@
 //
 
 
-#include "Demangle.h"
 #include "KSDemangle_Swift.h"
+#include "DemangleService.h"
 
 extern "C" char* ksdm_demangleSwift(const char* mangledSymbol)
 {
- swift::Demangle::DemangleOptions options = swift::Demangle::DemangleOptions::SimplifiedUIDemangleOptions();
- std::string demangled = swift::Demangle::demangleSymbolAsString(mangledSymbol, options);
- if(demangled.length() == 0)
- {
- return NULL;
- }
- return strdup(demangled.c_str());
+ return demangleSymbol(mangledSymbol);
 }