[llvm] r271756 - [llvm-profdata] Clean up the way we create the input filenames buffer (NFC)
Vedant Kumar via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 3 17:36:29 PDT 2016
Author: vedantk
Date: Fri Jun 3 19:36:28 2016
New Revision: 271756
URL: http://llvm.org/viewvc/llvm-project?rev=271756&view=rev
Log:
[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!
Modified:
llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
Modified: llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp?rev=271756&r1=271755&r2=271756&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp (original)
+++ llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp Fri Jun 3 19:36:28 2016
@@ -224,8 +224,7 @@ static WeightedFile parseWeightedFile(co
}
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
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
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 ch
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 " +
More information about the llvm-commits
mailing list