<div dir="ltr">FYI, we discussed this offline and discovered issues that I resolved in r192477 (which actually just restores things back to an earlier state).</div><div class="gmail_extra"><br><br><div class="gmail_quote">

On Fri, Oct 11, 2013 at 9:48 AM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

Author: rafael<br>
Date: Fri Oct 11 11:48:02 2013<br>
New Revision: 192463<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=192463&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=192463&view=rev</a><br>
Log:<br>
Fix handling of CHECK-DAG inside of CHECK-LABEL.<br>
<br>
Added:<br>
    llvm/trunk/test/FileCheck/check-label-dag.txt<br>
Modified:<br>
    llvm/trunk/utils/FileCheck/FileCheck.cpp<br>
<br>
Added: llvm/trunk/test/FileCheck/check-label-dag.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FileCheck/check-label-dag.txt?rev=192463&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FileCheck/check-label-dag.txt?rev=192463&view=auto</a><br>


==============================================================================<br>
--- llvm/trunk/test/FileCheck/check-label-dag.txt (added)<br>
+++ llvm/trunk/test/FileCheck/check-label-dag.txt Fri Oct 11 11:48:02 2013<br>
@@ -0,0 +1,11 @@<br>
+; RUN: not FileCheck -input-file %s %s 2>&1 | FileCheck --check-prefix=ERROR %s<br>
+<br>
+bar<br>
+zed<br>
+<br>
+CHECK-LABEL: {{^}}bar<br>
+CHECK-DAG: {{^}}foo<br>
+CHECK-LABEL: {{^}}zed<br>
+<br>
+ERROR: error: expected string not found in input<br>
+ERROR-NEXT: CHECK-DAG: {{.....}}foo<br>
<br>
Modified: llvm/trunk/utils/FileCheck/FileCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/FileCheck/FileCheck.cpp?rev=192463&r1=192462&r2=192463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/FileCheck/FileCheck.cpp?rev=192463&r1=192462&r2=192463&view=diff</a><br>


==============================================================================<br>
--- llvm/trunk/utils/FileCheck/FileCheck.cpp (original)<br>
+++ llvm/trunk/utils/FileCheck/FileCheck.cpp Fri Oct 11 11:48:02 2013<br>
@@ -879,12 +879,10 @@ size_t CheckString::Check(const SourceMg<br>
   size_t LastPos = 0;<br>
   std::vector<const Pattern *> NotStrings;<br>
<br>
-  if (CheckTy != Check::CheckLabel) {<br>
-    // Match "dag strings" (with mixed "not strings" if any).<br>
-    LastPos = CheckDag(SM, Buffer, NotStrings, VariableTable);<br>
-    if (LastPos == StringRef::npos)<br>
-      return StringRef::npos;<br>
-  }<br>
+  // Match "dag strings" (with mixed "not strings" if any).<br>
+  LastPos = CheckDag(SM, Buffer, NotStrings, VariableTable);<br>
+  if (LastPos == StringRef::npos)<br>
+    return StringRef::npos;<br>
<br>
   // Match itself from the last position after matching CHECK-DAG.<br>
   StringRef MatchBuffer = Buffer.substr(LastPos);<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>