intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-05 04:46:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Driver: Fix a parsing bug where some options were matched

Browse Source 
incorrectly. I'm blanking on the smartest way to write this search,
but we should just do the right thing when we move to TableGen.
 - <rdar://problem/6761194> [driver] -Wextra-tokens isn't parsed
   correctly

llvm-svn: 68525
This commit is contained in:
Daniel Dunbar
2009-04-07 18:21:47 +00:00
parent 84d573f256
commit b2a7c062aa
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
clang/lib/Driver/OptTable.cpp
View File

@@ -230,19 +230,26 @@ Arg *OptTable::ParseOneArg(const InputArgList &Args, unsigned &Index) const {
struct Info *Start = OptionInfos + FirstSearchableOption - 1;
struct Info *End = OptionInfos + LastOption - 1;
// Find the first option which could be a prefix.
// Search for the first next option which could be a prefix.
Start = std::lower_bound(Start, End, Str);
// Scan for first option which is a proper prefix.
for (; Start != End; ++Start)
if (memcmp(Str, Start->Name, strlen(Start->Name)) == 0)
break;
// Look for a match until we don't have a prefix.
// Options are stored in sorted order, with '\0' at the end of the
// alphabet. Since the only options which can accept a string must
// prefix it, we iteratively search for the next option which could
// be a prefix.
//
// FIXME: This is searching much more than necessary, but I am
// blanking on the simplest way to make it fast. We can solve this
// problem when we move to TableGen.
for (; Start != End; ++Start) {
if (memcmp(Start->Name, Str, strlen(Start->Name)) != 0)
// Scan for first option which is a proper prefix.
for (; Start != End; ++Start)
if (memcmp(Str, Start->Name, strlen(Start->Name)) == 0)
break;
if (Start == End)
break;
// See if this option matches.
options::ID id = (options::ID) (Start - OptionInfos + 1);
if (Arg *A = getOption(id)->accept(Args, Index))
return A;

4
clang/test/Driver/parsing.c
View File

@@ -15,6 +15,10 @@
// RUN: not clang -sectalign 1 2 2> %t &&
// RUN: grep "error: argument to '-sectalign' is missing (expected 3 values)" %t &&
// Verify that search continues after find the first option.
// RUN: clang -ccc-print-options -Wally 2> %t &&
// RUN: grep 'Option 0 - Name: "-W", Values: {"ally"}' %t &&
// RUN: true