Merge remote-tracking branch 'origin/main' into rebranch

swift-ci · swift-ci · commit ede51df7766f · 2021-01-27T17:52:54.000-08:00
diff --git a/lib/SILOptimizer/PassManager/PassPipeline.cpp b/lib/SILOptimizer/PassManager/PassPipeline.cpp
@@ -700,7 +700,8 @@ static void addLastChanceOptPassPipeline(SILPassPipelinePlan &P) {
   // Only has an effect if opt-remark is enabled.
   P.addOptRemarkGenerator();
 
-  P.addPruneVTables();
+  // FIXME: rdar://72935649 (Miscompile on combining PruneVTables with WMO)
+  // P.addPruneVTables();
 }
 
 static void addSILDebugInfoGeneratorPipeline(SILPassPipelinePlan &P) {

Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,8 @@ static void addLastChanceOptPassPipeline(SILPassPipelinePlan &P) {`
`700`	`700`	`// Only has an effect if opt-remark is enabled.`
`701`	`701`	`P.addOptRemarkGenerator();`
`702`	`702`
`703`		`- P.addPruneVTables();`
	`703`	`+ // FIXME: rdar://72935649 (Miscompile on combining PruneVTables with WMO)`
	`704`	`+ // P.addPruneVTables();`
`704`	`705`	`}`
`705`	`706`
`706`	`707`	`static void addSILDebugInfoGeneratorPipeline(SILPassPipelinePlan &P) {`