6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-26 21:32:10 +00:00
Code Issues Projects Releases Wiki Activity

FileCheck: fix a bug with multiple --check-prefix options. Similar to r194565

Browse Source 
Summary:
Directives are being ignored, when they occur between a partial-word false
match and any match on another prefix.

For example, with FOO and BAR prefixes:
   _FOO
   FOO: foo
   BAR: bar
FileCheck incorrectly matches:
   fog
   bar

This happens because FOO falsely matched as a partial word at '_FOO' and was
ignored while BAR matched at 'BAR:'. The match of BAR is incorrectly returned
as the 'first match' causing the FOO directive to be discarded.

Fixed this the same way as r194565 (D2166) did for a similar test case.
The partial-word false match should be counted as a match for the purposes of
finding the first match of a prefix, but should be returned as a false match
using CheckTy::CheckNone so that it isn't treated as a directive.

Fixes PR17995

Reviewers: samsonov, arsenm

Reviewed By: samsonov

CC: llvm-commits

Differential Revision: http://llvm-reviews.chandlerc.com/D2228

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195248 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Sanders 2013-11-20 13:25:05 +00:00
parent 7a8d0d7ff7
commit e4e260e6a7
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/FileCheck/check-multiple-prefixes-nomatch-2.txt Normal file
View File

@ -0,0 +1,10 @@
; RUN: not FileCheck -input-file %s %s -check-prefix=FOO -check-prefix=BAR 2>&1 | FileCheck %s
fog
bar
; _FOO not a valid check-line
; FOO: fo{{o}}
; BAR: ba{{r}}
; CHECK: {{error: expected string not found in input}}
; CHECK-NEXT: {{F}}OO: fo{{[{][{]o[}][}]}}

5
utils/FileCheck/FileCheck.cpp
View File

@ -795,10 +795,11 @@ static StringRef FindFirstCandidateMatch(StringRef &Buffer,
// it. This should also prevent matching the wrong prefix when one is a // it. This should also prevent matching the wrong prefix when one is a
// substring of another. // substring of another.
if (PrefixLoc != 0 && IsPartOfWord(Buffer[PrefixLoc - 1])) if (PrefixLoc != 0 && IsPartOfWord(Buffer[PrefixLoc - 1]))
continue; FirstTy = Check::CheckNone;
else
FirstTy = FindCheckType(Rest, Prefix);
FirstLoc = PrefixLoc; FirstLoc = PrefixLoc;
FirstTy = FindCheckType(Rest, Prefix);
FirstPrefix = Prefix; FirstPrefix = Prefix;
} }