aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2013-11-13 11:56:22 +0000
committerAlexey Samsonov <samsonov@google.com>2013-11-13 11:56:22 +0000
commit7df66416541b2001f2eb34eda543e2202617ba85 (patch)
treee828bba1feea51a1397eb17a3e7adce13cb2a264 /utils
parent8b99622b9b0902c709a33a07efb3461bc7830852 (diff)
downloadexternal_llvm-7df66416541b2001f2eb34eda543e2202617ba85.zip
external_llvm-7df66416541b2001f2eb34eda543e2202617ba85.tar.gz
external_llvm-7df66416541b2001f2eb34eda543e2202617ba85.tar.bz2
FileCheck: fix a bug with multiple --check-prefix options.
Summary: This fixes a subtle bug in new FileCheck feature added in r194343. When we search for the first satisfying check-prefix, we should actually return the first encounter of some check-prefix as a substring, even if it's not a part of valid check-line. Otherwise "FileCheck --check-prefix=FOO --check-prefix=BAR" with check file: FOO not a vaild check-line FOO: foo BAR: bar incorrectly accepted file: fog bar as it skipped the first two encounters of FOO, matching only BAR: line. Reviewers: arsenm, dsanders Reviewed By: dsanders CC: llvm-commits Differential Revision: http://llvm-reviews.chandlerc.com/D2166 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194565 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r--utils/FileCheck/FileCheck.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/FileCheck/FileCheck.cpp b/utils/FileCheck/FileCheck.cpp
index c9eb8a6..d5f7602 100644
--- a/utils/FileCheck/FileCheck.cpp
+++ b/utils/FileCheck/FileCheck.cpp
@@ -794,12 +794,12 @@ static StringRef FindFirstCandidateMatch(StringRef &Buffer,
continue;
Check::CheckType Ty = FindCheckType(Rest, Prefix);
- if (Ty == Check::CheckNone)
- continue;
FirstLoc = PrefixLoc;
FirstTy = Ty;
- FirstPrefix = Prefix;
+ // We've found the first matching check prefix. If it is invalid, we should
+ // continue the search after it.
+ FirstPrefix = (Ty == Check::CheckNone) ? "" : Prefix;
}
if (FirstPrefix.empty()) {