From 4b618dcc93285a2c1c9233db8f242264473f31b7 Mon Sep 17 00:00:00 2001
From: Paul Robinson <paul_robinson@playstation.sony.com>
Date: Fri, 26 Feb 2016 23:44:10 +0000
Subject: [PATCH] Revert r262092, caught LLD tests

llvm-svn: 262093
---
 llvm/test/FileCheck/no-multi-suffixes.txt | 28 ----------------------------
 llvm/utils/FileCheck/FileCheck.cpp        | 19 +------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 llvm/test/FileCheck/no-multi-suffixes.txt

diff --git a/llvm/test/FileCheck/no-multi-suffixes.txt b/llvm/test/FileCheck/no-multi-suffixes.txt
deleted file mode 100644
index 812a295..0000000
--- a/llvm/test/FileCheck/no-multi-suffixes.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-; RUN: not FileCheck -check-prefix=DAGNOT -input-file %s %s 2>&1 | FileCheck -check-prefix=ERROR -check-prefix=DAGNOT-ERROR %s
-; RUN: not FileCheck -check-prefix=NOTDAG -input-file %s %s 2>&1 | FileCheck -check-prefix=ERROR -check-prefix=NOTDAG-ERROR %s
-; RUN: not FileCheck -check-prefix=NEXTNOT -input-file %s %s 2>&1 | FileCheck -check-prefix=ERROR -check-prefix=NEXTNOT-ERROR %s
-; RUN: not FileCheck -check-prefix=NOTNEXT -input-file %s %s 2>&1 | FileCheck -check-prefix=ERROR -check-prefix=NOTNEXT-ERROR %s
-; RUN: not FileCheck -check-prefix=SAMENOT -input-file %s %s 2>&1 | FileCheck -check-prefix=ERROR -check-prefix=SAMENOT-ERROR %s
-; RUN: not FileCheck -check-prefix=NOTSAME -input-file %s %s 2>&1 | FileCheck -check-prefix=ERROR -check-prefix=NOTSAME-ERROR %s
-
-foo
-; DAGNOT: foo
-; DAGNOT-DAG-NOT: bar
-; NOTDAG: foo
-; NOTDAG-NOT-DAG: bar
-; NEXTNOT: foo
-; NEXTNOT-NEXT-NOT: bar
-; NOTNEXT: foo
-; NOTNEXT-NOT-NEXT: bar
-; SAMENOT: foo
-; SAMENOT-SAME-NOT: bar
-; NOTSAME: foo
-; NOTSAME-NOT-SAME: bar
-
-; ERROR: error: unsupported -NOT combo on prefix
-; DAGNOT-ERROR-SAME:  'DAGNOT'
-; NOTDAG-ERROR-SAME:  'NOTDAG'
-; NEXTNOT-ERROR-SAME: 'NEXTNOT'
-; NOTNEXT-ERROR-SAME: 'NOTNEXT'
-; SAMENOT-ERROR-SAME: 'SAMENOT'
-; NOTSAME-ERROR-SAME: 'NOTSAME'
diff --git a/llvm/utils/FileCheck/FileCheck.cpp b/llvm/utils/FileCheck/FileCheck.cpp
index 69f9302..593ea9f 100644
--- a/llvm/utils/FileCheck/FileCheck.cpp
+++ b/llvm/utils/FileCheck/FileCheck.cpp
@@ -86,9 +86,7 @@ namespace Check {
 
     /// MatchEOF - When set, this pattern only matches the end of file. This is
     /// used for trailing CHECK-NOTs.
-    CheckEOF,
-    /// CheckBadNot - Found -NOT combined with another CHECK suffix.
-    CheckBadNot
+    CheckEOF
   };
 }
 
@@ -695,7 +693,6 @@ static bool IsPartOfWord(char c) {
 static size_t CheckTypeSize(Check::CheckType Ty) {
   switch (Ty) {
   case Check::CheckNone:
-  case Check::CheckBadNot:
     return 0;
 
   case Check::CheckPlain:
@@ -749,12 +746,6 @@ static Check::CheckType FindCheckType(StringRef Buffer, StringRef Prefix) {
   if (Rest.startswith("LABEL:"))
     return Check::CheckLabel;
 
-  // You can't combine -NOT with another suffix.
-  if (Rest.startswith("DAG-NOT:") || Rest.startswith("NOT-DAG:") ||
-      Rest.startswith("NEXT-NOT:") || Rest.startswith("NOT-NEXT:") ||
-      Rest.startswith("SAME-NOT:") || Rest.startswith("NOT-SAME:"))
-    return Check::CheckBadNot;
-
   return Check::CheckNone;
 }
 
@@ -923,14 +914,6 @@ static bool ReadCheckFile(SourceMgr &SM,
     // PrefixLoc is to the start of the prefix. Skip to the end.
     Buffer = Buffer.drop_front(UsedPrefix.size() + CheckTypeSize(CheckTy));
 
-    // Complain about useful-looking but unsupported suffixes.
-    if (CheckTy == Check::CheckBadNot) {
-      SM.PrintMessage(SMLoc::getFromPointer(Buffer.data()),
-                      SourceMgr::DK_Error,
-                      "unsupported -NOT combo on prefix '" + UsedPrefix + "'");
-      return true;
-    }
-
     // Okay, we found the prefix, yay. Remember the rest of the line, but ignore
     // leading and trailing whitespace.
     Buffer = Buffer.substr(Buffer.find_first_not_of(" \t"));
-- 
2.7.4