Merge pull request swiftlang#21531 from compnerd/sil-opt-use-after-move

compnerd · web-flow · commit 01a26452820d · 2019-01-02T08:27:06.000-08:00
sil-opt: fix a use-after-move on Windows
diff --git a/tools/sil-opt/SILOpt.cpp b/tools/sil-opt/SILOpt.cpp
@@ -427,10 +427,10 @@ int main(int argc, char **argv) {
       llvm::errs() << EC.message() << '\n';
       return 1;
     }
-    CI.getSILModule()->setOptRecordStream(
-        llvm::make_unique<llvm::yaml::Output>(*OptRecordFile,
-                                              &CI.getSourceMgr()),
-        std::move(OptRecordFile));
+    auto Stream = llvm::make_unique<llvm::yaml::Output>(*OptRecordFile,
+                                                        &CI.getSourceMgr());
+    CI.getSILModule()->setOptRecordStream(std::move(Stream),
+                                          std::move(OptRecordFile));
   }
 
   if (OptimizationGroup == OptGroup::Diagnostics) {

Original file line number	Diff line number	Diff line change
`@@ -427,10 +427,10 @@ int main(int argc, char **argv) {`
`427`	`427`	`llvm::errs() << EC.message() << '\n';`
`428`	`428`	`return 1;`
`429`	`429`	`}`
`430`		`- CI.getSILModule()->setOptRecordStream(`
`431`		`- llvm::make_unique<llvm::yaml::Output>(*OptRecordFile,`
`432`		`- &CI.getSourceMgr()),`
`433`		`- std::move(OptRecordFile));`
	`430`	`+ auto Stream = llvm::make_unique<llvm::yaml::Output>(*OptRecordFile,`
	`431`	`+ &CI.getSourceMgr());`
	`432`	`+ CI.getSILModule()->setOptRecordStream(std::move(Stream),`
	`433`	`+ std::move(OptRecordFile));`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`if (OptimizationGroup == OptGroup::Diagnostics) {`