Merge pull request #14920 from davidungar/PR-18-9-batch-fix

David Ungar · web-flow · commit 30f95f4a90fb · 2018-03-05T09:25:47.000-08:00
[Batch mode]: Use first primary name for batch input file name.
diff --git a/lib/Frontend/FrontendInputsAndOutputs.cpp b/lib/Frontend/FrontendInputsAndOutputs.cpp
@@ -124,12 +124,9 @@ FrontendInputsAndOutputs::getRequiredUniquePrimaryInput() const {
 }
 
 std::string FrontendInputsAndOutputs::getStatsFileMangledInputName() const {
-  // FIXME: "batch" should probably be some concatenation of all the primary
-  // input names, in order to keep the stats file names unique. (Or perhaps just
-  // the first primary?)
-  return isWholeModule()
-             ? "all"
-             : primaryInputCount() == 1 ? firstPrimaryInput().file() : "batch";
+  // Use the first primary, even if there are multiple primaries.
+  // That's enough to keep the file names unique.
+  return isWholeModule() ? "all" : firstPrimaryInput().file();
 }
 
 bool FrontendInputsAndOutputs::isInputPrimary(StringRef file) const {

Original file line number	Diff line number	Diff line change
`@@ -124,12 +124,9 @@ FrontendInputsAndOutputs::getRequiredUniquePrimaryInput() const {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`std::string FrontendInputsAndOutputs::getStatsFileMangledInputName() const {`
`127`		`- // FIXME: "batch" should probably be some concatenation of all the primary`
`128`		`- // input names, in order to keep the stats file names unique. (Or perhaps just`
`129`		`- // the first primary?)`
`130`		`- return isWholeModule()`
`131`		`- ? "all"`
`132`		`- : primaryInputCount() == 1 ? firstPrimaryInput().file() : "batch";`
	`127`	`+ // Use the first primary, even if there are multiple primaries.`
	`128`	`+ // That's enough to keep the file names unique.`
	`129`	`+ return isWholeModule() ? "all" : firstPrimaryInput().file();`
`133`	`130`	`}`
`134`	`131`
`135`	`132`	`bool FrontendInputsAndOutputs::isInputPrimary(StringRef file) const {`