Merge pull request #59462 from apple/egorzhdan/cxx-libswift-workaround-arm64-linux-crash

egorzhdan · web-flow · commit 1d47f1a2aa42 · 2022-06-16T11:58:25.000+01:00
[cxx-interop][SwiftCompilerSources] Workaround for `std::string` crash on arm64 Linux
diff --git a/SwiftCompilerSources/Sources/SIL/BasicBlock.swift b/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))
+    let stdString = SILBasicBlock_debugDescription(bridged)
+    return String(_cxxString: stdString)
   }
   public var shortDescription: String { name }
 
diff --git a/SwiftCompilerSources/Sources/SIL/Function.swift b/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))
+    let stdString = SILFunction_debugDescription(bridged)
+    return String(_cxxString: stdString)
   }
 
   public var shortDescription: String { name.string }
diff --git a/SwiftCompilerSources/Sources/SIL/GlobalVariable.swift b/SwiftCompilerSources/Sources/SIL/GlobalVariable.swift
@@ -19,7 +19,8 @@ final public class GlobalVariable : CustomStringConvertible, HasShortDescription
   }
 
   public var description: String {
-    String(_cxxString: SILGlobalVariable_debugDescription(bridged))
+    let stdString = SILGlobalVariable_debugDescription(bridged)
+    return String(_cxxString: stdString)
   }
 
   public var shortDescription: String { name.string }
diff --git a/SwiftCompilerSources/Sources/SIL/Instruction.swift b/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))
+    let stdString = SILNode_debugDescription(bridgedNode)
+    return String(_cxxString: stdString)
   }
 
   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))
+    let stdString = SILNode_debugDescription(bridgedNode)
+    return String(_cxxString: stdString)
   }
 
   public var instruction: Instruction {
diff --git a/SwiftCompilerSources/Sources/SIL/Value.swift b/SwiftCompilerSources/Sources/SIL/Value.swift
@@ -81,7 +81,8 @@ public enum Ownership {
 
 extension Value {
   public var description: String {
-    String(_cxxString: SILNode_debugDescription(bridgedNode))
+    let stdString = SILNode_debugDescription(bridgedNode)
+    return String(_cxxString: stdString)
   }
 
   public var uses: UseList {
diff --git a/test/SILOptimizer/addr_escape_info.sil b/test/SILOptimizer/addr_escape_info.sil
@@ -2,9 +2,6 @@
 
 // REQUIRES: swift_in_compiler
 
-// rdar92963081
-// UNSUPPORTED: OS=linux-gnu
-
 sil_stage canonical
 
 import Builtin
diff --git a/test/SILOptimizer/escape_info.sil b/test/SILOptimizer/escape_info.sil
@@ -2,9 +2,6 @@
 
 // REQUIRES: swift_in_compiler
 
-// rdar92963081
-// UNSUPPORTED: OS=linux-gnu
-
 sil_stage canonical
 
 import Builtin
diff --git a/test/SILOptimizer/ranges.sil b/test/SILOptimizer/ranges.sil
@@ -2,9 +2,6 @@
 
 // REQUIRES: swift_in_compiler
 
-// rdar92963081
-// UNSUPPORTED: OS=linux-gnu
-
 sil_stage canonical
 
 // CHECK-LABEL: Instruction range in basic_test:

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ final public class BasicBlock : ListNode, CustomStringConvertible, HasShortDescr`
`25`	`25`	`public var function: Function { SILBasicBlock_getFunction(bridged).function }`
`26`	`26`
`27`	`27`	`public var description: String {`
`28`		`- String(_cxxString: SILBasicBlock_debugDescription(bridged))`
	`28`	`+ let stdString = SILBasicBlock_debugDescription(bridged)`
	`29`	`+ return String(_cxxString: stdString)`
`29`	`30`	`}`
`30`	`31`	`public var shortDescription: String { name }`
`31`	`32`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ final public class Function : CustomStringConvertible, HasShortDescription {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`final public var description: String {`
`24`		`- String(_cxxString: SILFunction_debugDescription(bridged))`
	`24`	`+ let stdString = SILFunction_debugDescription(bridged)`
	`25`	`+ return String(_cxxString: stdString)`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`public var shortDescription: String { name.string }`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ final public class GlobalVariable : CustomStringConvertible, HasShortDescription`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public var description: String {`
`22`		`- String(_cxxString: SILGlobalVariable_debugDescription(bridged))`
	`22`	`+ let stdString = SILGlobalVariable_debugDescription(bridged)`
	`23`	`+ return String(_cxxString: stdString)`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`public var shortDescription: String { name.string }`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ public enum Ownership {`
`81`	`81`
`82`	`82`	`extension Value {`
`83`	`83`	`public var description: String {`
`84`		`- String(_cxxString: SILNode_debugDescription(bridgedNode))`
	`84`	`+ let stdString = SILNode_debugDescription(bridgedNode)`
	`85`	`+ return String(_cxxString: stdString)`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`public var uses: UseList {`