Driver: Add Option flags.

llvm-svn: 66774

2 files changed, 5 insertions, 3 deletions

diff --git a/clang/lib/Driver/OptTable.cpp b/clang/lib/Driver/OptTable.cpp
index 5caaace3ad0..00a949f086b 100644
--- a/clang/lib/Driver/OptTable.cpp
+++ b/clang/lib/Driver/OptTable.cpp
@@ -46,6 +46,7 @@ static Info &getInfo(unsigned id) {
 }
 
 OptTable::OptTable() : Options(new Option*[numOptions]) { 
+  memset(Options, 0, sizeof(*Options) * numOptions);
 }
 
 OptTable::~OptTable() { 
@@ -108,11 +109,11 @@ Option *OptTable::constructOption(options::ID id) const {
   for (const char *s = info.Flags; *s; ++s) {
     switch (*s) {
     default: assert(0 && "Invalid option flag.");
-    case 'l': Opt->setLinkerInput(true); break;
-    case 'i': Opt->setNoOptAsInput(true); break;
     case 'J': Opt->setForceJoinedRender(true); break;
     case 'S': Opt->setForceSeparateRender(true); break;
-    case 'U': Opt->setUnsupported(true); break;
+    case 'i': Opt->setNoOptAsInput(true); break;
+    case 'l': Opt->setLinkerInput(true); break;
+    case 'u': Opt->setUnsupported(true); break;
     }
   }
 
diff --git a/clang/lib/Driver/Option.cpp b/clang/lib/Driver/Option.cpp
index 7a530094557..083eb8e9dae 100644
--- a/clang/lib/Driver/Option.cpp
+++ b/clang/lib/Driver/Option.cpp
@@ -190,6 +190,7 @@ MultiArgOption::MultiArgOption(options::ID ID, const char *Name,
                                const OptionGroup *Group, const Option *Alias, 
                                unsigned _NumArgs)
   : Option(Option::MultiArgClass, ID, Name, Group, Alias), NumArgs(_NumArgs) {
+  assert(NumArgs > 1  && "Invalid MultiArgOption!");
 }
 
 Arg *MultiArgOption::accept(const ArgList &Args, unsigned &Index) const {