Skip to content

Commit 0af68d4

Browse files
committed
Remove workaround for SR-1457 now that it has been fixed.
1 parent fb6975e commit 0af68d4

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

Sources/Build/ToolProtocol.swift

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,7 @@ struct SwiftcTool: ToolProtocol {
8484
var objects: [AbsolutePath] { return module.sources.relativePaths.map{ tempsPath.appending(RelativePath($0.asString + ".o")) } }
8585
var sources: [AbsolutePath] { return module.sources.paths }
8686
var isLibrary: Bool { return module.type == .library }
87-
var enableWholeModuleOptimization: Bool {
88-
#if EnableWorkaroundForSR1457
89-
return false
90-
#else
91-
return conf == .release
92-
#endif
93-
}
87+
var enableWholeModuleOptimization: Bool { return conf == .release }
9488

9589
func append(to stream: OutputByteStream) {
9690
stream <<< " tool: swift-compiler\n"

Utilities/bootstrap

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ class Target(object):
203203
compile_swift_node = '<compile-swift-%s>' % (self.name,)
204204
link_input_nodes.append(compile_swift_node)
205205

206-
# Enable the workaround for SR-1457 until it is fixed.
207-
other_args.extend(["-DEnableWorkaroundForSR1457"])
208-
209206
if args.libdispatch_source_dir:
210207
other_args.extend(["-Xcc", "-fblocks"])
211208

0 commit comments

Comments
 (0)