[llvm] r187651 - Fix handling of CHECK-DAG combined with CHECK-NOT

[Tim Northover]

Author: tnorthover
Date: Fri Aug  2 06:32:50 2013
New Revision: 187651

URL: http://llvm.org/viewvc/llvm-project?rev=187651&view=rev
Log:
Fix handling of CHECK-DAG combined with CHECK-NOT

Patch by Daniel Sanders.

Modified:
    llvm/trunk/test/FileCheck/check-dag.txt
    llvm/trunk/utils/FileCheck/FileCheck.cpp

Modified: llvm/trunk/test/FileCheck/check-dag.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FileCheck/check-dag.txt?rev=187651&r1=187650&r2=187651&view=diff
==============================================================================
--- llvm/trunk/test/FileCheck/check-dag.txt (original)
+++ llvm/trunk/test/FileCheck/check-dag.txt Fri Aug  2 06:32:50 2013
@@ -22,4 +22,5 @@ mul r5, r10, r11
 
 ; CHECK-DAG: add [[REG1:r[0-9]+]], r1, r2
 ; CHECK-DAG: add [[REG2:r[0-9]+]], r3, r4
+; CHECK-NOT: xor
 ; CHECK-DAG: mul r5, [[REG1]], [[REG2]]

Modified: llvm/trunk/utils/FileCheck/FileCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/FileCheck/FileCheck.cpp?rev=187651&r1=187650&r2=187651&view=diff
==============================================================================
--- llvm/trunk/utils/FileCheck/FileCheck.cpp (original)
+++ llvm/trunk/utils/FileCheck/FileCheck.cpp Fri Aug  2 06:32:50 2013
@@ -1013,8 +1013,7 @@ size_t CheckString::CheckDag(const Sourc
       // CHECK-DAG, verify that there's no 'not' strings occurred in that
       // region.
       StringRef SkippedRegion = Buffer.substr(LastPos, MatchPos);
-      size_t Pos = CheckNot(SM, SkippedRegion, NotStrings, VariableTable);
-      if (Pos != StringRef::npos)
+      if (CheckNot(SM, SkippedRegion, NotStrings, VariableTable))
         return StringRef::npos;
       // Clear "not strings".
       NotStrings.clear();