Skip to content

Commit d31d82c

Browse files
committed
SIL: remove a workaround for a Windows 5.10 host compiler crash
#73253 should be fixed in 6.0, which is now used as host compiler.
1 parent 37455b6 commit d31d82c

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyConvertEscapeToNoEscape.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ private extension ConvertEscapeToNoEscapeInst {
2828
/// %3 = thin_to_thick_function %1 to $@noescape () -> ()
2929

3030
func tryCombineWithThinToThickOperand(_ context: SimplifyContext) {
31-
// compiling bridged.getFunctionTypeWithNoEscape crashes the 5.10 Windows compiler
32-
#if !os(Windows)
33-
// TODO: https://github.com/apple/swift/issues/73253
34-
3531
if let thinToThick = fromFunction as? ThinToThickFunctionInst {
3632
let builder = Builder(before: self, context)
3733
let noEscapeFnType = thinToThick.type.getFunctionType(withNoEscape: true)
@@ -40,6 +36,5 @@ private extension ConvertEscapeToNoEscapeInst {
4036
uses.replaceAll(with: newThinToThick, context)
4137
context.erase(instruction: self)
4238
}
43-
#endif
4439
}
4540
}

SwiftCompilerSources/Sources/SIL/Type.swift

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,10 @@ public struct Type : TypeProperties, CustomStringConvertible, NoReflectionChildr
9999
GenericSignature(bridged: bridged.getInvocationGenericSignatureOfFunctionType())
100100
}
101101

102-
// compiling bridged.getFunctionTypeWithNoEscape crashes the 5.10 Windows compiler
103-
// TODO: https://github.com/apple/swift/issues/73253
104-
#if !os(Windows)
105-
// Returns a new SILFunctionType with changed "escapeness".
106-
public func getFunctionType(withNoEscape: Bool) -> Type {
107-
bridged.getFunctionTypeWithNoEscape(withNoEscape).type
108-
}
109-
#endif
102+
// Returns a new SILFunctionType with changed "escapeness".
103+
public func getFunctionType(withNoEscape: Bool) -> Type {
104+
bridged.getFunctionTypeWithNoEscape(withNoEscape).type
105+
}
110106

111107
//===--------------------------------------------------------------------===//
112108
// Aggregates

0 commit comments

Comments
 (0)