diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-03-20 01:12:00 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-03-20 01:12:00 +0000 |
| commit | 4ea3aea534bb89bd63a0f0c1670f5519a6c1b1fb (patch) | |
| tree | 92778ba6010a2b526359aba8ae03199f704458b6 /clang/lib/Driver/OptTable.cpp | |
| parent | aef1db1d714d2680a9d05bc58e60f3c85437b953 (diff) | |
| download | llvm-4ea3aea534bb89bd63a0f0c1670f5519a6c1b1fb.zip llvm-4ea3aea534bb89bd63a0f0c1670f5519a6c1b1fb.tar.gz llvm-4ea3aea534bb89bd63a0f0c1670f5519a6c1b1fb.tar.bz2 | |
Driver: Allow Render{Separate,Joined} option flags on JoinedOrSeparate option types.
Also, simplify/fix SeparateArg::render with forced join.
llvm-svn: 99022
Diffstat (limited to 'clang/lib/Driver/OptTable.cpp')
| -rw-r--r-- | clang/lib/Driver/OptTable.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Driver/OptTable.cpp b/clang/lib/Driver/OptTable.cpp index f69d5d8..de1e459 100644 --- a/clang/lib/Driver/OptTable.cpp +++ b/clang/lib/Driver/OptTable.cpp @@ -167,11 +167,13 @@ Option *OptTable::CreateOption(unsigned id) const { if (info.Flags & RenderAsInput) Opt->setNoOptAsInput(true); if (info.Flags & RenderJoined) { - assert(info.Kind == Option::SeparateClass && "Invalid option."); + assert((info.Kind == Option::JoinedOrSeparateClass || + info.Kind == Option::SeparateClass) && "Invalid option."); Opt->setForceJoinedRender(true); } if (info.Flags & RenderSeparate) { - assert(info.Kind == Option::JoinedClass && "Invalid option."); + assert((info.Kind == Option::JoinedOrSeparateClass || + info.Kind == Option::JoinedClass) && "Invalid option."); Opt->setForceSeparateRender(true); } if (info.Flags & Unsupported) |