summaryrefslogtreecommitdiffstats
path: root/llvm/utils
diff options
context:
space:
mode:
authorPaul Robinson <paul_robinson@playstation.sony.com>2016-02-26 23:44:10 +0000
committerPaul Robinson <paul_robinson@playstation.sony.com>2016-02-26 23:44:10 +0000
commit4b618dcc93285a2c1c9233db8f242264473f31b7 (patch)
tree885ac0cf5566a9755616c692a2c988e6a7d7adb7 /llvm/utils
parentabcfa39566cd7c3a0f8a2c2afed17e75163fd78d (diff)
downloadbcm5719-llvm-4b618dcc93285a2c1c9233db8f242264473f31b7.tar.gz
bcm5719-llvm-4b618dcc93285a2c1c9233db8f242264473f31b7.zip
Revert r262092, caught LLD tests
llvm-svn: 262093
Diffstat (limited to 'llvm/utils')
-rw-r--r--llvm/utils/FileCheck/FileCheck.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/llvm/utils/FileCheck/FileCheck.cpp b/llvm/utils/FileCheck/FileCheck.cpp
index 69f93020317..593ea9f441b 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"));
OpenPOWER on IntegriCloud