From 7df66416541b2001f2eb34eda543e2202617ba85 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Wed, 13 Nov 2013 11:56:22 +0000 Subject: 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 --- utils/FileCheck/FileCheck.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'utils') 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()) { -- cgit v1.1