6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-18 11:24:01 +00:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary in C++11 c_str() calls

Browse Source 
While theoratically required in pre-C++11 to avoid re-allocation upon call,
C++11 guarantees that c_str() returns a pointer to the internal array so
pre-calling c_str() is no longer required.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242983 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Yaron Keren
2015-07-23 05:49:29 +00:00
parent eb653bd9d1
commit c9cbb9371f
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Support/Unix/Signals.inc
View File

@ -144,9 +144,6 @@ static void RemoveFilesToRemove() {
// memory. // memory.
std::vector<std::string>& FilesToRemoveRef = *FilesToRemove; std::vector<std::string>& FilesToRemoveRef = *FilesToRemove;
for (unsigned i = 0, e = FilesToRemoveRef.size(); i != e; ++i) { for (unsigned i = 0, e = FilesToRemoveRef.size(); i != e; ++i) {
// We rely on a std::string implementation for which repeated calls to
// 'c_str()' don't allocate memory. We pre-call 'c_str()' on all of these
// strings to try to ensure this is safe.
const char *path = FilesToRemoveRef[i].c_str(); const char *path = FilesToRemoveRef[i].c_str();
// Get the status so we can determine if it's a file or directory. If we // Get the status so we can determine if it's a file or directory. If we
@ -231,21 +228,7 @@ bool llvm::sys::RemoveFileOnSignal(StringRef Filename,
std::string* ErrMsg) { std::string* ErrMsg) {
{ {
sys::SmartScopedLock<true> Guard(*SignalsMutex); sys::SmartScopedLock<true> Guard(*SignalsMutex);
std::vector<std::string>& FilesToRemoveRef = *FilesToRemove; FilesToRemove->push_back(Filename);
std::string *OldPtr =
FilesToRemoveRef.empty() ? nullptr : &FilesToRemoveRef[0];
FilesToRemoveRef.push_back(Filename);
// We want to call 'c_str()' on every std::string in this vector so that if
// the underlying implementation requires a re-allocation, it happens here
// rather than inside of the signal handler. If we see the vector grow, we
// have to call it on every entry. If it remains in place, we only need to
// call it on the latest one.
if (OldPtr == &FilesToRemoveRef[0])
FilesToRemoveRef.back().c_str();
else
for (unsigned i = 0, e = FilesToRemoveRef.size(); i != e; ++i)
FilesToRemoveRef[i].c_str();
} }
RegisterHandlers(); RegisterHandlers();