Fix handling of CHECK-DAG inside of CHECK-LABEL.

llvm-svn: 192463

llvm/test/FileCheck/check-label-dag.txt

@@ -0,0 +1,11 @@
+; RUN: not FileCheck -input-file %s %s 2>&1 | FileCheck --check-prefix=ERROR %s
+
+bar
+zed
+
+CHECK-LABEL: {{^}}bar
+CHECK-DAG: {{^}}foo
+CHECK-LABEL: {{^}}zed
+
+ERROR: error: expected string not found in input
+ERROR-NEXT: CHECK-DAG: {{.....}}foo

llvm/utils/FileCheck/FileCheck.cpp

@@ -879,12 +879,10 @@ size_t CheckString::Check(const SourceMgr &SM, StringRef Buffer,
   size_t LastPos = 0;
   std::vector<const Pattern *> NotStrings;
 
-  if (CheckTy != Check::CheckLabel) {
   // Match "dag strings" (with mixed "not strings" if any).
   LastPos = CheckDag(SM, Buffer, NotStrings, VariableTable);
   if (LastPos == StringRef::npos)
     return StringRef::npos;
-  }
 
   // Match itself from the last position after matching CHECK-DAG.
   StringRef MatchBuffer = Buffer.substr(LastPos);