[PATCH] D86315: Test all CHECK-NOT in a block even if one fails

[Thomas Preud'homme via Phabricator via llvm-commits]

thopre updated this revision to Diff 287372.
thopre added a comment.

Rebase to see if CI is now green.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D86315/new/

https://reviews.llvm.org/D86315

Files:
  llvm/lib/Support/FileCheck.cpp
  llvm/test/FileCheck/multiple-check-not-failures.txt


Index: llvm/test/FileCheck/multiple-check-not-failures.txt
===================================================================
--- /dev/null
+++ llvm/test/FileCheck/multiple-check-not-failures.txt
@@ -0,0 +1,32 @@
+; Check that all errors in a CHECK-NOT blocks are reported, but that FileCheck
+; does not check past the block.
+RUN: %ProtectFileCheckOutput \
+RUN: not FileCheck --dump-input=never --input-file %s %s 2>&1 | \
+RUN:   FileCheck --strict-whitespace --check-prefix CHECK-ERRORS %s
+
+foo
+bar
+
+barrier
+
+baz
+
+CHECK-NOT: bar
+CHECK-NOT: foo
+CHECK: barrier
+CHECK-NOT: baz
+
+CHECK-ERRORS: multiple-check-not-failures.txt:[[#@LINE-5]]:12: error: {{C}}HECK-NOT: excluded string found in input
+CHECK-ERRORS-NEXT:      {{C}}HECK-NOT: bar
+CHECK-ERRORS-NEXT:     {{^}}           ^{{$}}
+CHECK-ERRORS-NEXT:      multiple-check-not-failures.txt:[[#@LINE-14]]:1: note: found here
+CHECK-ERRORS-NEXT:      bar
+CHECK-ERRORS-NEXT: {{^}}^~~{{$}}
+CHECK-ERRORS-NEXT:      multiple-check-not-failures.txt:[[#@LINE-10]]:12: error: {{C}}HECK-NOT: excluded string found in input
+CHECK-ERRORS-NEXT:      {{C}}HECK-NOT: foo
+CHECK-ERRORS-NEXT:     {{^}}           ^{{$}}
+CHECK-ERRORS-NEXT:      multiple-check-not-failures.txt:[[#@LINE-21]]:1: note: found here
+CHECK-ERRORS-NEXT:      foo
+CHECK-ERRORS-NEXT: {{^}}^~~{{$}}
+CHECK-ERRORS-NOT: error:
+CHECK-ERRORS-NOT:      {{C}}HECK-NOT: baz
Index: llvm/lib/Support/FileCheck.cpp
===================================================================
--- llvm/lib/Support/FileCheck.cpp
+++ llvm/lib/Support/FileCheck.cpp
@@ -2197,6 +2197,7 @@
                                const std::vector<const Pattern *> &NotStrings,
                                const FileCheckRequest &Req,
                                std::vector<FileCheckDiag> *Diags) const {
+  bool DirectiveFail = false;
   for (const Pattern *Pat : NotStrings) {
     assert((Pat->getCheckTy() == Check::CheckNot) && "Expect CHECK-NOT!");
 
@@ -2212,11 +2213,11 @@
 
     PrintMatch(false, SM, Prefix, Pat->getLoc(), *Pat, 1, Buffer, Pos, MatchLen,
                Req, Diags);
-
-    return true;
+    DirectiveFail = true;
+    continue;
   }
 
-  return false;
+  return DirectiveFail;
 }
 
 size_t FileCheckString::CheckDag(const SourceMgr &SM, StringRef Buffer,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D86315.287372.patch
Type: text/x-patch
Size: 2290 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200824/b70d8379/attachment.bin>