FileCheck: Add CHECK-SAME
authorDuncan P. N. Exon Smith <dexonsmith@apple.com>
Thu, 26 Feb 2015 04:53:00 +0000 (04:53 +0000)
committerDuncan P. N. Exon Smith <dexonsmith@apple.com>
Thu, 26 Feb 2015 04:53:00 +0000 (04:53 +0000)
commit01ac1707d64a7e3162005185f697c2a8061a774e
tree0ceef4c281265300ad4e521956a6af50a4fe56ec
parent59b25cbeaa6d4768cb23814a637f5a814b83eead
FileCheck: Add CHECK-SAME

Add `CHECK-SAME`, which requires that the pattern matches on the *same*
line as the previous `CHECK`/`CHECK-NEXT` -- in other words, no newline
is allowed in the skipped region.  This is similar to `CHECK-NEXT`,
which requires exactly 1 newline in the skipped region.

My motivation is to simplify checking the long lines of LLVM assembly
for the new debug info hierarchy.  This allows CHECK sequences like the
following:

    CHECK:      ![[REF]] = !SomeMDNode(
    CHECK-SAME: file: ![[FILE:[0-9]+]]
    CHECK-SAME: otherField: 93{{[,)]}}

which is equivalent to:

    CHECK: ![[REF]] = !SomeMDNode({{.*}}file: ![[FILE:[0-9]+]]{{.*}}otherField: 93{{[,)]}}

While this example just has two fields, many nodes in debug info have
more than that.  `CHECK-SAME` will keep the logic easy to follow.

Morever, it enables interleaving `CHECK-NOT`s without allowing newlines.
Consider the following:

    CHECK:      ![[REF]] = !SomeMDNode(
    CHECK-SAME: file: ![[FILE:[0-9]+]]
    CHECK-NOT:  unexpectedField:
    CHECK-SAME: otherField: 93{{[,)]}}
    CHECK-NOT:  otherUnexpectedField:
    CHECK-SAME: )

which doesn't seem to have an equivalent `CHECK` line.

llvm-svn: 230612
llvm/test/FileCheck/same.txt [new file with mode: 0644]
llvm/utils/FileCheck/FileCheck.cpp