Fix PR1318 by reacting appropriately to a mutating option list.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35905 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index 768bd6c..3d30e7a 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -394,6 +394,10 @@
// the positional args into the PositionalVals list...
Option *ActivePositionalArg = 0;
+ // Keep track of the option list so far so that we can tell if it is ever
+ // extended.
+ Option *CurOptionList = RegisteredOptionList;
+
// Loop over all of the arguments... processing them.
bool DashDashFound = false; // Have we read '--'?
for (int i = 1; i < argc; ++i) {
@@ -401,6 +405,16 @@
const char *Value = 0;
const char *ArgName = "";
+ // If the head of the option list changed, this means that some command line
+ // option has just been registered or deregistered. This can occur in
+ // response to things like -load, etc. If this happens, rescan the options.
+ if (CurOptionList != RegisteredOptionList) {
+ PositionalOpts.clear();
+ Opts.clear();
+ GetOptionInfo(PositionalOpts, Opts);
+ CurOptionList = RegisteredOptionList;
+ }
+
// Check to see if this is a positional argument. This argument is
// considered to be positional if it doesn't start with '-', if it is "-"
// itself, or if we have seen "--" already.