Merge pull request #59317 from apple/egorzhdan/revert-libswift-string-init

Revert "[cxx-interop][SwiftCompilerSources] Fix conversion between `std::string` and `Swift.String`"

Author: egorzhdan

SwiftCompilerSources/Sources/Basic/Utils.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 @_exported import BasicBridging
-import std
 
 //===----------------------------------------------------------------------===//
 //                              StringRef
@@ -61,13 +60,6 @@ extension String {
       return c(BridgedStringRef(data: buffer.baseAddress, length: buffer.count))
     }
   }
-
-  /// Underscored to avoid name collision with the std overlay.
-  /// To be replaced with an overlay call once the CI uses SDKs built with Swift 5.8.
-  public init(_cxxString s: std.string) {
-    self.init(cString: s.c_str())
-    withExtendedLifetime(s) {}
-  }
 }
 
 extension Array {

SwiftCompilerSources/Sources/SIL/BasicBlock.swift

@@ -25,7 +25,8 @@ final public class BasicBlock : ListNode, CustomStringConvertible, HasShortDescr
   public var function: Function { SILBasicBlock_getFunction(bridged).function }
 
   public var description: String {
-    String(_cxxString: SILBasicBlock_debugDescription(bridged))
+    var s = SILBasicBlock_debugDescription(bridged)
+    return String(cString: s.c_str())
   }
   public var shortDescription: String { name }
 

SwiftCompilerSources/Sources/SIL/Function.swift

@@ -21,7 +21,8 @@ final public class Function : CustomStringConvertible, HasShortDescription {
   }
 
   final public var description: String {
-    String(_cxxString: SILFunction_debugDescription(bridged))
+    var s = SILFunction_debugDescription(bridged)
+    return String(cString: s.c_str())
   }
 
   public var shortDescription: String { name.string }

SwiftCompilerSources/Sources/SIL/GlobalVariable.swift

@@ -19,7 +19,8 @@ final public class GlobalVariable : CustomStringConvertible, HasShortDescription
   }
 
   public var description: String {
-    String(_cxxString: SILGlobalVariable_debugDescription(bridged))
+    var s = SILGlobalVariable_debugDescription(bridged)
+    return String(cString: s.c_str())
   }
 
   public var shortDescription: String { name.string }

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -38,7 +38,8 @@ public class Instruction : ListNode, CustomStringConvertible, Hashable {
   final public var function: Function { block.function }
 
   final public var description: String {
-    String(_cxxString: SILNode_debugDescription(bridgedNode))
+    var s = SILNode_debugDescription(bridgedNode)
+    return String(cString: s.c_str())
   }
 
   final public var operands: OperandArray {
@@ -142,7 +143,8 @@ public class SingleValueInstruction : Instruction, Value {
 
 public final class MultipleValueInstructionResult : Value {
   final public var description: String {
-    String(_cxxString: SILNode_debugDescription(bridgedNode))
+    var s = SILNode_debugDescription(bridgedNode)
+    return String(cString: s.c_str())
   }
 
   public var instruction: Instruction {

SwiftCompilerSources/Sources/SIL/Value.swift

@@ -81,7 +81,8 @@ public enum Ownership {
 
 extension Value {
   public var description: String {
-    String(_cxxString: SILNode_debugDescription(bridgedNode))
+    var s = SILNode_debugDescription(bridgedNode)
+    return String(cString: s.c_str())
   }
 
   public var uses: UseList {

test/SILOptimizer/addr_escape_info.sil

@@ -2,6 +2,9 @@
 
 // REQUIRES: swift_in_compiler
 
+// rdar92963081
+// UNSUPPORTED: OS=linux-gnu
+
 sil_stage canonical
 
 import Builtin

test/SILOptimizer/escape_info.sil

@@ -2,6 +2,9 @@
 
 // REQUIRES: swift_in_compiler
 
+// rdar92963081
+// UNSUPPORTED: OS=linux-gnu
+
 
 sil_stage canonical
 

test/SILOptimizer/ranges.sil

@@ -2,6 +2,9 @@
 
 // REQUIRES: swift_in_compiler
 
+// rdar92963081
+// UNSUPPORTED: OS=linux-gnu
+
 
 sil_stage canonical