Remove Swift dependency on non-public C++ APIs

swift/src/Ice/InputStream.swift

@@ -361,11 +361,8 @@ public class InputStream {
             return
         }
 
-        ICETraceUtil.traceSlicing(
-            kind: sliceType == SliceType.ExceptionSlice ? "exception" : "object",
-            typeId: typeId,
-            slicingCat: "Slicing",
-            logger: LoggerWrapper(handle: communicator.getLogger()))
+        let kind = sliceType == SliceType.ExceptionSlice ? "exception" : "object"
+        communicator.getLogger().trace(category: "Slicing", message: "unknown \(kind) type '\(typeId)'")
     }
 
     static func throwUOE(expectedType: Value.Type, v: Value) throws {

swift/src/Ice/ServantManager.swift

@@ -25,7 +25,7 @@ class ServantManager: Dispatcher {
                 if m[facet] != nil {
                     var id = communicator.identityToString(ident)
                     if !facet.isEmpty {
-                        id += try " - f " + escapeString(string: facet, special: "", communicator: communicator)
+                        id += " -f \(facet)"
                     }
                     throw AlreadyRegisteredException(kindOfObject: "servant", id: id)
                 }
@@ -52,7 +52,7 @@ class ServantManager: Dispatcher {
             guard var m = servantMapMap[ident], let obj = m.removeValue(forKey: facet) else {
                 var id = communicator.identityToString(ident)
                 if !facet.isEmpty {
-                    id += try " - f " + escapeString(string: facet, special: "", communicator: communicator)
+                    id += " -f \(facet)"
                 }
                 throw NotRegisteredException(kindOfObject: "servant", id: id)
             }
@@ -125,8 +125,7 @@ class ServantManager: Dispatcher {
     func addServantLocator(locator: ServantLocator, category: String) throws {
         return try mutex.sync {
             guard locatorMap[category] == nil else {
-                let id = try escapeString(string: category, special: "", communicator: communicator)
-                throw AlreadyRegisteredException(kindOfObject: "servant locator", id: id)
+                throw AlreadyRegisteredException(kindOfObject: "servant locator", id: category)
             }
 
             locatorMap[category] = locator
@@ -136,8 +135,7 @@ class ServantManager: Dispatcher {
     func removeServantLocator(category: String) throws -> ServantLocator {
         return try mutex.sync {
             guard let l = locatorMap.removeValue(forKey: category) else {
-                let id = try escapeString(string: category, special: "", communicator: communicator)
-                throw NotRegisteredException(kindOfObject: "servant locator", id: id)
+                throw NotRegisteredException(kindOfObject: "servant locator", id: category)
             }
 
             return l

swift/src/Ice/Util.swift

@@ -26,18 +26,6 @@ func stringToMajorMinor(_ s: String) throws -> (UInt8, UInt8) {
     return (major, minor)
 }
 
-func escapeString(string: String, special: String, communicator: Communicator) throws -> String {
-    guard factoriesRegistered else {
-        fatalError("Unable to initialize Ice")
-    }
-    return try autoreleasepool {
-        try ICEUtil.escapeString(
-            string: string,
-            special: special,
-            communicator: (communicator as! CommunicatorI).handle)
-    }
-}
-
 func checkSupportedEncoding(_ v: EncodingVersion) throws {
     let c = currentEncoding
     if v.major != c.major || v.minor > c.minor {

swift/src/IceImpl/IceUtil.mm

@@ -6,8 +6,6 @@
 #import "include/Logger.h"
 #import "include/Properties.h"
 
-#import "Ice/Instance.h"
-#import "Ice/Network.h"
 #import "Ice/StringUtil.h"
 
 namespace
@@ -180,32 +178,4 @@ + (NSString*)encodingVersionToString:(UInt8)major minor:(UInt8)minor
     return toNSString(Ice::encodingVersionToString(v));
 }
 
-+ (NSString*)escapeString:(NSString*)string
-                  special:(NSString*)special
-             communicator:(ICECommunicator*)communicator
-                    error:(NSError* __autoreleasing _Nullable*)error
-{
-    try
-    {
-        auto instance = IceInternal::getInstance([communicator communicator]);
-        return toNSString(
-            IceInternal::escapeString(fromNSString(string), fromNSString(special), instance->toStringMode()));
-    }
-    catch (...)
-    {
-        *error = convertException(std::current_exception());
-        return nil;
-    }
-}
-
-+ (NSString*)errorToString:(int32_t)error
-{
-    return toNSString(IceInternal::errorToString(error));
-}
-
-+ (NSString*)errorToStringDNS:(int32_t)error
-{
-    return toNSString(IceInternal::errorToStringDNS(error));
-}
-
 @end

swift/src/IceImpl/include/IceUtil.h

@@ -49,15 +49,6 @@ ICEIMPL_API @interface ICEUtil : NSObject
 
 + (NSString*)encodingVersionToString:(UInt8)major
                                minor:(UInt8)minor NS_SWIFT_NAME(encodingVersionToString(major:minor:));
-
-+ (nullable NSString*)escapeString:(NSString*)string
-                           special:(NSString*)special
-                      communicator:(ICECommunicator*)communicator
-                             error:(NSError* _Nullable* _Nullable)error
-    NS_SWIFT_NAME(escapeString(string:special:communicator:));
-
-+ (NSString*)errorToString:(int32_t)error NS_SWIFT_NAME(errorToString(_:));
-+ (NSString*)errorToStringDNS:(int32_t)error NS_SWIFT_NAME(errorToStringDNS(_:));
 @end
 
 NS_ASSUME_NONNULL_END