6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-27 12:26:08 +00:00
Code Issues Projects Releases Wiki Activity

Revert "[Support] Promote cl::StringSaver to a separate utility"

Browse Source 
This reverts commit r215784 / 3f8a26f6fe.

LLD has 3 StringSaver's, one of which takes a lock when saving the
string... Need to investigate more closely.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215790 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Silva
2014-08-15 23:39:01 +00:00
parent f0d509a1ba
commit 855d60236a
4 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Support/CommandLine.cpp
View File

@@ -76,6 +76,7 @@ void parser<double>::anchor() {}
void parser<float>::anchor() {}
void parser<std::string>::anchor() {}
void parser<char>::anchor() {}
void StringSaver::anchor() {}
//===----------------------------------------------------------------------===//
@@ -508,7 +509,7 @@ void cl::TokenizeGNUCommandLine(StringRef Src, StringSaver &Saver,
// End the token if this is whitespace.
if (isWhitespace(Src[I])) {
if (!Token.empty())
NewArgv.push_back(Saver.saveCStr(Token.c_str()));
NewArgv.push_back(Saver.SaveString(Token.c_str()));
Token.clear();
continue;
}
@@ -519,7 +520,7 @@ void cl::TokenizeGNUCommandLine(StringRef Src, StringSaver &Saver,
// Append the last token after hitting EOF with no whitespace.
if (!Token.empty())
NewArgv.push_back(Saver.saveCStr(Token.c_str()));
NewArgv.push_back(Saver.SaveString(Token.c_str()));
}
/// Backslashes are interpreted in a rather complicated way in the Windows-style
@@ -592,7 +593,7 @@ void cl::TokenizeWindowsCommandLine(StringRef Src, StringSaver &Saver,
if (State == UNQUOTED) {
// Whitespace means the end of the token.
if (isWhitespace(Src[I])) {
NewArgv.push_back(Saver.saveCStr(Token.c_str()));
NewArgv.push_back(Saver.SaveString(Token.c_str()));
Token.clear();
State = INIT;
continue;
@@ -624,7 +625,7 @@ void cl::TokenizeWindowsCommandLine(StringRef Src, StringSaver &Saver,
}
// Append the last token after hitting EOF with no whitespace.
if (!Token.empty())
NewArgv.push_back(Saver.saveCStr(Token.c_str()));
NewArgv.push_back(Saver.SaveString(Token.c_str()));
}
static bool ExpandResponseFile(const char *FName, StringSaver &Saver,
@@ -690,6 +691,25 @@ bool cl::ExpandResponseFiles(StringSaver &Saver, TokenizerCallback Tokenizer,
return AllExpanded;
}
namespace {
class StrDupSaver : public StringSaver {
std::vector<char*> Dups;
public:
~StrDupSaver() {
for (std::vector<char *>::iterator I = Dups.begin(), E = Dups.end();
I != E; ++I) {
char *Dup = *I;
free(Dup);
}
}
const char *SaveString(const char *Str) override {
char *Dup = strdup(Str);
Dups.push_back(Dup);
return Dup;
}
};
}
/// ParseEnvironmentOptions - An alternative entry point to the
/// CommandLine library, which allows you to read the program's name
/// from the caller (as PROGNAME) and its command-line arguments from
@@ -709,8 +729,8 @@ void cl::ParseEnvironmentOptions(const char *progName, const char *envVar,
// Get program's "name", which we wouldn't know without the caller
// telling us.
SmallVector<const char *, 20> newArgv;
StringSaver Saver;
newArgv.push_back(Saver.saveCStr(progName));
StrDupSaver Saver;
newArgv.push_back(Saver.SaveString(progName));
// Parse the value of the environment variable into a "command line"
// and hand it off to ParseCommandLineOptions().
@@ -734,7 +754,7 @@ void cl::ParseCommandLineOptions(int argc, const char * const *argv,
SmallVector<const char *, 20> newArgv;
for (int i = 0; i != argc; ++i)
newArgv.push_back(argv[i]);
StringSaver Saver;
StrDupSaver Saver;
ExpandResponseFiles(Saver, TokenizeGNUCommandLine, newArgv);
argv = &newArgv[0];
argc = static_cast<int>(newArgv.size());