Merge pull request #2592 from swiftwasm/release/5.4

pull[bot] · web-flow · commit 80c0cb59333d · 2021-01-28T07:37:58.000Z
[pull] swiftwasm-release/5.4 from release/5.4
diff --git a/lib/SILOptimizer/PassManager/PassPipeline.cpp b/lib/SILOptimizer/PassManager/PassPipeline.cpp
@@ -698,7 +698,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) {
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -300,6 +300,7 @@ reconfigure
 
 verbose-build
 build-ninja
+skip-test-cmark
 
 [preset: buildbot_incremental_base_all_platforms]
 mixin-preset=buildbot_incremental_base

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