[cfe-commits] r69342 - in /cfe/trunk: test/Driver/qa_override.c tools/driver/driver.cpp
Daniel Dunbar
daniel at zuster.org
Thu Apr 16 18:54:01 PDT 2009
Author: ddunbar
Date: Thu Apr 16 20:54:00 2009
New Revision: 69342
URL: http://llvm.org/viewvc/llvm-project?rev=69342&view=rev
Log:
Support QA_OVERRIDE_GCC3_OPTIONS
- Cover your eyes...
- This is a simple but effective way to allow developers to build a
project with clang while manipulating the command line, without
having to edit the project itself.
Added:
cfe/trunk/test/Driver/qa_override.c
Modified:
cfe/trunk/tools/driver/driver.cpp
Added: cfe/trunk/test/Driver/qa_override.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/qa_override.c?rev=69342&view=auto
==============================================================================
--- cfe/trunk/test/Driver/qa_override.c (added)
+++ cfe/trunk/test/Driver/qa_override.c Thu Apr 16 20:54:00 2009
@@ -0,0 +1,6 @@
+// RUN: env QA_OVERRIDE_GCC3_OPTIONS="+-Os +-Oz +-O +-O3 +-Oignore +a +b +c xb Xa Omagic ^-ccc-print-options " clang x -O2 b -O3 2> %t &&
+// RUN: grep -F 'Option 0 - Name: "<input>", Values: {"x"}' %t &&
+// RUN: grep -F 'Option 1 - Name: "-O", Values: {"ignore"}' %t &&
+// RUN: grep -F 'Option 2 - Name: "-O", Values: {"magic"}' %t &&
+// RUN: true
+
Modified: cfe/trunk/tools/driver/driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=69342&r1=69341&r2=69342&view=diff
==============================================================================
--- cfe/trunk/tools/driver/driver.cpp (original)
+++ cfe/trunk/tools/driver/driver.cpp Thu Apr 16 20:54:00 2009
@@ -68,6 +68,102 @@
return llvm::sys::Path::GetMainExecutable(Argv0, P);
}
+static const char *SaveStringInSet(std::set<std::string> &SavedStrings,
+ const std::string &S) {
+ return SavedStrings.insert(S).first->c_str();
+}
+
+/// ApplyQAOverride - Apply a list of edits to the input argument lists.
+///
+/// The input string is a space separate list of edits to perform,
+/// they are applied in order to the input argument lists. Edits
+/// should be one of the following forms:
+///
+/// '^': Add FOO as a new argument at the beginning of the command line.
+///
+/// '+': Add FOO as a new argument at the end of the command line.
+///
+/// 's/XXX/YYY/': Replace the literal argument XXX by YYY in the
+/// command line.
+///
+/// 'xOPTION': Removes all instances of the literal argument OPTION.
+///
+/// 'XOPTION': Removes all instances of the literal argument OPTION,
+/// and the following argument.
+///
+/// 'Ox': Removes all flags matching 'O' or 'O[sz0-9]' and adds 'Ox'
+/// at the end of the command line.
+void ApplyOneQAOverride(std::vector<const char*> &Args,
+ const std::string &Edit,
+ std::set<std::string> &SavedStrings) {
+ // This does not need to be efficient.
+
+ if (Edit[0] == '^') {
+ const char *Str =
+ SaveStringInSet(SavedStrings, Edit.substr(1, std::string::npos));
+ llvm::errs() << "### Adding argument " << Str << " at beginning\n";
+ Args.insert(Args.begin() + 1, Str);
+ } else if (Edit[0] == '+') {
+ const char *Str =
+ SaveStringInSet(SavedStrings, Edit.substr(1, std::string::npos));
+ llvm::errs() << "### Adding argument " << Str << " at end\n";
+ Args.push_back(Str);
+ } else if (Edit[0] == 'x' || Edit[0] == 'X') {
+ std::string Option = Edit.substr(1, std::string::npos);
+ for (unsigned i = 1; i < Args.size();) {
+ if (Option == Args[i]) {
+ llvm::errs() << "### Deleting argument " << Args[i] << '\n';
+ Args.erase(Args.begin() + i);
+ if (Edit[0] == 'X') {
+ if (i < Args.size()) {
+ llvm::errs() << "### Deleting argument " << Args[i] << '\n';
+ Args.erase(Args.begin() + i);
+ } else
+ llvm::errs() << "### Invalid X edit, end of command line!\n";
+ }
+ } else
+ ++i;
+ }
+ } else if (Edit[0] == 'O') {
+ for (unsigned i = 1; i < Args.size();) {
+ const char *A = Args[i];
+ if (A[0] == '-' && A[1] == 'O' &&
+ (A[2] == '\0' ||
+ (A[3] == '\0' && (A[2] == 's' || A[2] == 'z' ||
+ ('0' <= A[2] && A[2] <= '9'))))) {
+ llvm::errs() << "### Deleting argument " << Args[i] << '\n';
+ Args.erase(Args.begin() + i);
+ } else
+ ++i;
+ }
+ llvm::errs() << "### Adding argument " << Edit << " at end\n";
+ Args.push_back(SaveStringInSet(SavedStrings, '-' + Edit));
+ } else {
+ llvm::errs() << "### Unrecognized edit: " << Edit << "\n";
+ }
+}
+
+/// ApplyQAOverride - Apply a comma separate list of edits to the
+/// input argument lists. See ApplyOneQAOverride.
+void ApplyQAOverride(std::vector<const char*> &Args, const char *OverrideStr,
+ std::set<std::string> &SavedStrings) {
+ llvm::errs() << "### QA_OVERRIDE_GCC3_OPTIONS: " << OverrideStr << "\n";
+
+ // This does not need to be efficient.
+
+ const char *S = OverrideStr;
+ while (*S) {
+ const char *End = ::strchr(S, ' ');
+ if (!End)
+ End = S + strlen(S);
+ if (End != S)
+ ApplyOneQAOverride(Args, std::string(S, End), SavedStrings);
+ S = End;
+ if (*S != '\0')
+ ++S;
+ }
+}
+
int main(int argc, const char **argv) {
llvm::sys::PrintStackTraceOnErrorSignal();
llvm::PrettyStackTraceProgram X(argc, argv);
@@ -85,9 +181,18 @@
llvm::OwningPtr<Compilation> C;
- // Handle CCC_ADD_ARGS, a comma separated list of extra arguments.
+ // Handle QA_OVERRIDE_GCC3_OPTIONS and CCC_ADD_ARGS, used for editing a
+ // command line behind the scenes.
std::set<std::string> SavedStrings;
- if (const char *Cur = ::getenv("CCC_ADD_ARGS")) {
+ if (const char *OverrideStr = ::getenv("QA_OVERRIDE_GCC3_OPTIONS")) {
+ // FIXME: Driver shouldn't take extra initial argument.
+ std::vector<const char*> StringPointers(argv, argv + argc);
+
+ ApplyQAOverride(StringPointers, OverrideStr, SavedStrings);
+
+ C.reset(TheDriver->BuildCompilation(StringPointers.size(),
+ &StringPointers[0]));
+ } else if (const char *Cur = ::getenv("CCC_ADD_ARGS")) {
std::vector<const char*> StringPointers;
// FIXME: Driver shouldn't take extra initial argument.
@@ -97,16 +202,12 @@
const char *Next = strchr(Cur, ',');
if (Next) {
- const char *P =
- SavedStrings.insert(std::string(Cur, Next)).first->c_str();
- StringPointers.push_back(P);
+ StringPointers.push_back(SaveStringInSet(SavedStrings,
+ std::string(Cur, Next)));
Cur = Next + 1;
} else {
- if (*Cur != '\0') {
- const char *P =
- SavedStrings.insert(std::string(Cur)).first->c_str();
- StringPointers.push_back(P);
- }
+ if (*Cur != '\0')
+ StringPointers.push_back(SaveStringInSet(SavedStrings, Cur));
break;
}
}
More information about the cfe-commits
mailing list