maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-profdata] Clean up the way we create the input filenames buffer (NFC) 

Create the buffer before calling parseInputFilenamesFile(), and add a
comment explaining why this is done.

Thanks to David Li for the suggestion!

llvm-svn: 271756
This commit is contained in:
Vedant Kumar 2016-06-04 00:36:28 +00:00
parent 42b1f65f03
commit f771a050db
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
llvm/tools/llvm-profdata/llvm-profdata.cpp
View File

@ -224,8 +224,7 @@ static WeightedFile parseWeightedFile(const StringRef &WeightedFilename) {
}
static std::unique_ptr<MemoryBuffer>
parseInputFilenamesFile(const StringRef &InputFilenamesFile,
WeightedFileVector &WFV) {
getInputFilenamesFileBuf(const StringRef &InputFilenamesFile) {
if (InputFilenamesFile == "")
return {};
@ -233,10 +232,16 @@ parseInputFilenamesFile(const StringRef &InputFilenamesFile,
if (!BufOrError)
exitWithErrorCode(BufOrError.getError(), InputFilenamesFile);
std::unique_ptr<MemoryBuffer> Buffer = std::move(*BufOrError);
StringRef Data = Buffer->getBuffer();
return std::move(*BufOrError);
}
static void parseInputFilenamesFile(MemoryBuffer *Buffer,
WeightedFileVector &WFV) {
if (!Buffer)
return;
SmallVector<StringRef, 8> Entries;
StringRef Data = Buffer->getBuffer();
Data.split(Entries, '\n', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
for (const StringRef &FileWeightEntry : Entries) {
StringRef SanitizedEntry = FileWeightEntry.trim(" \t\v\f\r");
@ -249,8 +254,6 @@ parseInputFilenamesFile(const StringRef &InputFilenamesFile,
else
WFV.emplace_back(parseWeightedFile(SanitizedEntry));
}
return Buffer;
}
static int merge_main(int argc, const char *argv[]) {
@ -293,7 +296,11 @@ static int merge_main(int argc, const char *argv[]) {
WeightedInputs.push_back(WeightedFile(Filename, 1));
for (StringRef WeightedFilename : WeightedInputFilenames)
WeightedInputs.push_back(parseWeightedFile(WeightedFilename));
auto Buf = parseInputFilenamesFile(InputFilenamesFile, WeightedInputs);
// Make sure that the file buffer stays alive for the duration of the
// weighted input vector's lifetime.
auto Buffer = getInputFilenamesFileBuf(InputFilenamesFile);
parseInputFilenamesFile(Buffer.get(), WeightedInputs);
if (WeightedInputs.empty())
exitWithError("No input files specified. See " +