[llvm] b7a66d0 - [llvm] Use SmallString::operator std::string (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Fri Jan 19 18:54:23 PST 2024
Author: Kazu Hirata
Date: 2024-01-19T18:54:11-08:00
New Revision: b7a66d0faeb1d2838e89c3632ba7835e6c2af6cc
URL: https://github.com/llvm/llvm-project/commit/b7a66d0faeb1d2838e89c3632ba7835e6c2af6cc
DIFF: https://github.com/llvm/llvm-project/commit/b7a66d0faeb1d2838e89c3632ba7835e6c2af6cc.diff
LOG: [llvm] Use SmallString::operator std::string (NFC)
Added:
Modified:
llvm/include/llvm/ADT/APFixedPoint.h
llvm/include/llvm/ADT/StringExtras.h
llvm/include/llvm/IR/ModuleSummaryIndex.h
llvm/include/llvm/Object/MachO.h
llvm/include/llvm/TableGen/StringToOffsetTable.h
llvm/lib/DWARFLinker/Classic/DWARFLinker.cpp
llvm/lib/DWARFLinker/Parallel/DWARFLinkerCompileUnit.cpp
llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
llvm/lib/ExecutionEngine/ExecutionEngine.cpp
llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp
llvm/lib/LTO/LTO.cpp
llvm/lib/LTO/ThinLTOCodeGenerator.cpp
llvm/lib/LineEditor/LineEditor.cpp
llvm/lib/Object/Archive.cpp
llvm/lib/ProfileData/GCOV.cpp
llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
llvm/lib/Transforms/Utils/NameAnonGlobals.cpp
llvm/lib/WindowsDriver/MSVCPaths.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ADT/APFixedPoint.h b/llvm/include/llvm/ADT/APFixedPoint.h
index 5442968d20e4af7..b0c510865f444e4 100644
--- a/llvm/include/llvm/ADT/APFixedPoint.h
+++ b/llvm/include/llvm/ADT/APFixedPoint.h
@@ -235,7 +235,7 @@ class APFixedPoint {
std::string toString() const {
SmallString<40> S;
toString(S);
- return std::string(S.str());
+ return std::string(S);
}
void print(raw_ostream &) const;
diff --git a/llvm/include/llvm/ADT/StringExtras.h b/llvm/include/llvm/ADT/StringExtras.h
index c6fb8b6528089cc..a24368924bc90aa 100644
--- a/llvm/include/llvm/ADT/StringExtras.h
+++ b/llvm/include/llvm/ADT/StringExtras.h
@@ -332,7 +332,7 @@ inline std::string toString(const APInt &I, unsigned Radix, bool Signed,
bool formatAsCLiteral = false) {
SmallString<40> S;
I.toString(S, Radix, Signed, formatAsCLiteral);
- return std::string(S.str());
+ return std::string(S);
}
inline std::string toString(const APSInt &I, unsigned Radix) {
diff --git a/llvm/include/llvm/IR/ModuleSummaryIndex.h b/llvm/include/llvm/IR/ModuleSummaryIndex.h
index 66c7d10d823d9c2..395c9e332eb8f35 100644
--- a/llvm/include/llvm/IR/ModuleSummaryIndex.h
+++ b/llvm/include/llvm/IR/ModuleSummaryIndex.h
@@ -1715,7 +1715,7 @@ class ModuleSummaryIndex {
SmallString<256> NewName(Name);
NewName += ".llvm.";
NewName += Suffix;
- return std::string(NewName.str());
+ return std::string(NewName);
}
/// Helper to obtain the unpromoted name for a global value (or the original
diff --git a/llvm/include/llvm/Object/MachO.h b/llvm/include/llvm/Object/MachO.h
index f91f21d837ce7b1..24f9954584ed5d7 100644
--- a/llvm/include/llvm/Object/MachO.h
+++ b/llvm/include/llvm/Object/MachO.h
@@ -826,7 +826,7 @@ class MachOObjectFile : public ObjectFile {
Version = utostr(major) + "." + utostr(minor);
if (update != 0)
Version += "." + utostr(update);
- return std::string(std::string(Version.str()));
+ return std::string(std::string(Version));
}
/// If the input path is a .dSYM bundle (as created by the dsymutil tool),
diff --git a/llvm/include/llvm/TableGen/StringToOffsetTable.h b/llvm/include/llvm/TableGen/StringToOffsetTable.h
index 7fcf20abed6164a..66bcc81c94b5940 100644
--- a/llvm/include/llvm/TableGen/StringToOffsetTable.h
+++ b/llvm/include/llvm/TableGen/StringToOffsetTable.h
@@ -45,7 +45,7 @@ class StringToOffsetTable {
// Escape the string.
SmallString<256> Str;
raw_svector_ostream(Str).write_escaped(AggregateString);
- AggregateString = std::string(Str.str());
+ AggregateString = std::string(Str);
O << " \"";
unsigned CharsPrinted = 0;
diff --git a/llvm/lib/DWARFLinker/Classic/DWARFLinker.cpp b/llvm/lib/DWARFLinker/Classic/DWARFLinker.cpp
index 6c85f9ac24bec68..bcb8b94c1fa5afa 100644
--- a/llvm/lib/DWARFLinker/Classic/DWARFLinker.cpp
+++ b/llvm/lib/DWARFLinker/Classic/DWARFLinker.cpp
@@ -218,7 +218,7 @@ static void analyzeImportedModule(
ReportWarning(Twine("Conflicting parseable interfaces for Swift Module ") +
*Name + ": " + Entry + " and " + Path,
DIE);
- Entry = std::string(ResolvedPath.str());
+ Entry = std::string(ResolvedPath);
}
/// The distinct types of work performed by the work loop in
diff --git a/llvm/lib/DWARFLinker/Parallel/DWARFLinkerCompileUnit.cpp b/llvm/lib/DWARFLinker/Parallel/DWARFLinkerCompileUnit.cpp
index 212264714c2a576..fe2748f79c06d85 100644
--- a/llvm/lib/DWARFLinker/Parallel/DWARFLinkerCompileUnit.cpp
+++ b/llvm/lib/DWARFLinker/Parallel/DWARFLinkerCompileUnit.cpp
@@ -294,7 +294,7 @@ void CompileUnit::analyzeImportedModule(const DWARFDebugInfoEntry *DieEntry) {
": " + Entry + " and " + Path + ".",
&Die);
}
- Entry = std::string(ResolvedPath.str());
+ Entry = std::string(ResolvedPath);
}
}
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
index 78792cf83891670..28f05644a3aa111 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp
@@ -1456,7 +1456,7 @@ bool DWARFDebugLine::Prologue::getFileNameByIndex(
// sys::path::append skips empty strings.
sys::path::append(FilePath, Style, IncludeDir, FileName);
- Result = std::string(FilePath.str());
+ Result = std::string(FilePath);
return true;
}
diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
index 37806be448ae160..5f29226c14b705a 100644
--- a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
+++ b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
@@ -303,7 +303,7 @@ std::string getDarwinDWARFResourceForPath(const std::string &Path,
}
sys::path::append(ResourceName, "Contents", "Resources", "DWARF");
sys::path::append(ResourceName, Basename);
- return std::string(ResourceName.str());
+ return std::string(ResourceName);
}
bool checkFileCRC(StringRef Path, uint32_t CRCHash) {
diff --git a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
index 7abb9e9a6786b47..31c290ad505303a 100644
--- a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -197,7 +197,7 @@ std::string ExecutionEngine::getMangledName(const GlobalValue *GV) {
: GV->getParent()->getDataLayout();
Mangler::getNameWithPrefix(FullName, GV->getName(), DL);
- return std::string(FullName.str());
+ return std::string(FullName);
}
void ExecutionEngine::addGlobalMapping(const GlobalValue *GV, void *Addr) {
diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp
index 5e0623102d335fe..f7852b0ca62e536 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp
@@ -323,7 +323,7 @@ static Error InitDebuggingDir(PerfState &State) {
return make_error<StringError>(std::move(ErrStr), inconvertibleErrorCode());
}
- State.JitPath = std::string(UniqueDebugDir.str());
+ State.JitPath = std::string(UniqueDebugDir);
return Error::success();
}
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
index 6a1e53b96998c62..b38c568d10cd097 100644
--- a/llvm/lib/LTO/LTO.cpp
+++ b/llvm/lib/LTO/LTO.cpp
@@ -1573,7 +1573,7 @@ std::string lto::getThinLTOOutputFile(StringRef Path, StringRef OldPrefix,
llvm::errs() << "warning: could not create directory '" << ParentPath
<< "': " << EC.message() << '\n';
}
- return std::string(NewPath.str());
+ return std::string(NewPath);
}
namespace {
diff --git a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
index 443439b71e7566c..535faf5f780474c 100644
--- a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
+++ b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
@@ -947,11 +947,11 @@ ThinLTOCodeGenerator::writeGeneratedObject(int count, StringRef CacheEntryPath,
// Cache is enabled, hard-link the entry (or copy if hard-link fails).
auto Err = sys::fs::create_hard_link(CacheEntryPath, OutputPath);
if (!Err)
- return std::string(OutputPath.str());
+ return std::string(OutputPath);
// Hard linking failed, try to copy.
Err = sys::fs::copy_file(CacheEntryPath, OutputPath);
if (!Err)
- return std::string(OutputPath.str());
+ return std::string(OutputPath);
// Copy failed (could be because the CacheEntry was removed from the cache
// in the meantime by another process), fall back and try to write down the
// buffer to the output.
@@ -964,7 +964,7 @@ ThinLTOCodeGenerator::writeGeneratedObject(int count, StringRef CacheEntryPath,
if (Err)
report_fatal_error(Twine("Can't open output '") + OutputPath + "'\n");
OS << OutputBuffer.getBuffer();
- return std::string(OutputPath.str());
+ return std::string(OutputPath);
}
// Main entry point for the ThinLTO processing
diff --git a/llvm/lib/LineEditor/LineEditor.cpp b/llvm/lib/LineEditor/LineEditor.cpp
index bb408411a330e6b..d0d138bb1f9d8dc 100644
--- a/llvm/lib/LineEditor/LineEditor.cpp
+++ b/llvm/lib/LineEditor/LineEditor.cpp
@@ -25,7 +25,7 @@ std::string LineEditor::getDefaultHistoryPath(StringRef ProgName) {
SmallString<32> Path;
if (sys::path::home_directory(Path)) {
sys::path::append(Path, "." + ProgName + "-history");
- return std::string(Path.str());
+ return std::string(Path);
}
return std::string();
}
diff --git a/llvm/lib/Object/Archive.cpp b/llvm/lib/Object/Archive.cpp
index 4ac4d727afb6982..e447e5b23316f11 100644
--- a/llvm/lib/Object/Archive.cpp
+++ b/llvm/lib/Object/Archive.cpp
@@ -567,7 +567,7 @@ Expected<std::string> Archive::Child::getFullName() const {
SmallString<128> FullName = sys::path::parent_path(
Parent->getMemoryBufferRef().getBufferIdentifier());
sys::path::append(FullName, Name);
- return std::string(FullName.str());
+ return std::string(FullName);
}
Expected<StringRef> Archive::Child::getBuffer() const {
diff --git a/llvm/lib/ProfileData/GCOV.cpp b/llvm/lib/ProfileData/GCOV.cpp
index f7bf42e5c4d25ec..fcfeb5b0f5844ca 100644
--- a/llvm/lib/ProfileData/GCOV.cpp
+++ b/llvm/lib/ProfileData/GCOV.cpp
@@ -666,7 +666,7 @@ static std::string mangleCoveragePath(StringRef Filename, bool PreservePaths) {
if (S < I)
Result.append(S, I);
- return std::string(Result.str());
+ return std::string(Result);
}
std::string Context::getCoveragePath(StringRef filename,
diff --git a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
index 1c140edb07ac73d..5d7ec0fb03098ca 100644
--- a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
+++ b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
@@ -67,7 +67,7 @@ class LibOptTable : public opt::GenericOptTable {
static std::string getDefaultOutputPath(const NewArchiveMember &FirstMember) {
SmallString<128> Val = StringRef(FirstMember.Buf->getBufferIdentifier());
sys::path::replace_extension(Val, ".lib");
- return std::string(Val.str());
+ return std::string(Val);
}
static std::vector<StringRef> getSearchPaths(opt::InputArgList *Args,
diff --git a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
index 1ff0a34bae243a4..c7f6f2a43c17f59 100644
--- a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
+++ b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
@@ -535,7 +535,7 @@ std::string GCOVProfiler::mangleName(const DICompileUnit *CU,
SmallString<128> Filename = GCovFile->getString();
sys::path::replace_extension(Filename, Notes ? "gcno" : "gcda");
- return std::string(Filename.str());
+ return std::string(Filename);
}
}
@@ -546,7 +546,7 @@ std::string GCOVProfiler::mangleName(const DICompileUnit *CU,
if (sys::fs::current_path(CurPath))
return std::string(FName);
sys::path::append(CurPath, FName);
- return std::string(CurPath.str());
+ return std::string(CurPath);
}
bool GCOVProfiler::runOnModule(
diff --git a/llvm/lib/Transforms/Utils/NameAnonGlobals.cpp b/llvm/lib/Transforms/Utils/NameAnonGlobals.cpp
index f41a14cdfbec507..9655cb9cf6f4001 100644
--- a/llvm/lib/Transforms/Utils/NameAnonGlobals.cpp
+++ b/llvm/lib/Transforms/Utils/NameAnonGlobals.cpp
@@ -54,7 +54,7 @@ class ModuleHasher {
Hasher.final(Hash);
SmallString<32> Result;
MD5::stringifyResult(Hash, Result);
- TheHash = std::string(Result.str());
+ TheHash = std::string(Result);
return TheHash;
}
};
diff --git a/llvm/lib/WindowsDriver/MSVCPaths.cpp b/llvm/lib/WindowsDriver/MSVCPaths.cpp
index b69ee11c1931b03..634cfcb15f1d953 100644
--- a/llvm/lib/WindowsDriver/MSVCPaths.cpp
+++ b/llvm/lib/WindowsDriver/MSVCPaths.cpp
@@ -328,7 +328,7 @@ bool appendArchToWindowsSDKLibPath(int SDKMajor, SmallString<128> LibPath,
}
}
- path = std::string(LibPath.str());
+ path = std::string(LibPath);
return true;
}
@@ -383,7 +383,7 @@ std::string getSubDirectoryPath(SubDirectoryType Type, ToolsetLayout VSLayout,
sys::path::append(Path, "lib", SubdirName);
break;
}
- return std::string(Path.str());
+ return std::string(Path);
}
bool useUniversalCRT(ToolsetLayout VSLayout, const std::string &VCToolChainPath,
@@ -720,7 +720,7 @@ bool findVCToolChainViaRegistry(std::string &Path, ToolsetLayout &VSLayout) {
SmallString<256> VCPath(StringRef(VSInstallPath.c_str(), pos));
sys::path::append(VCPath, "VC");
- Path = std::string(VCPath.str());
+ Path = std::string(VCPath);
VSLayout = ToolsetLayout::OlderVS;
return true;
}
More information about the llvm-commits
mailing list