Merge pull request swiftlang#23605 from gottesmm/pr-937f01d72cc45dc9fcaa37f4fb1a5b008030344e

swift-ci · web-flow · commit 3ce5a8a74d14 · 2019-03-27T15:58:29.000-07:00
diff --git a/lib/SILOptimizer/PassManager/PassPipeline.cpp b/lib/SILOptimizer/PassManager/PassPipeline.cpp
@@ -100,7 +100,7 @@ static void addMandatoryOptPipeline(SILPassPipelinePlan &P) {
   // there.
   const auto &Options = P.getOptions();
   P.addClosureLifetimeFixup();
-  if (Options.EnableMandatorySemanticARCOpts && Options.shouldOptimize()) {
+  if (Options.shouldOptimize()) {
     P.addSemanticARCOpts();
   }
   if (Options.StripOwnershipDuringDiagnosticsPipeline)

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ static void addMandatoryOptPipeline(SILPassPipelinePlan &P) {`
`100`	`100`	`// there.`
`101`	`101`	`const auto &Options = P.getOptions();`
`102`	`102`	`P.addClosureLifetimeFixup();`
`103`		`- if (Options.EnableMandatorySemanticARCOpts && Options.shouldOptimize()) {`
	`103`	`+ if (Options.shouldOptimize()) {`
`104`	`104`	`P.addSemanticARCOpts();`
`105`	`105`	`}`
`106`	`106`	`if (Options.StripOwnershipDuringDiagnosticsPipeline)`