[PATCH] D79820: [test] Improve FileCheck's numeric-expression.txt

Thu May 14 10:50:21 PDT 2020

thopre marked 5 inline comments as done.
thopre added inline comments.

================
Comment at: llvm/test/FileCheck/numeric-expression.txt:228-236
 STRVAR NUMVAR CONFLICT
 redef1 42
 foobar
 redef2 42
 CONFLICT-LABEL: STRVAR NUMVAR CONFLICT
 CONFLICT1-NEXT: redef1 [[#NUMVAR:]]
 CONFLICT2: [[NUMVAR:foo.*]]
----------------
jdenny wrote:
> Can these checks be inlined like the others?
I'm not too keen on it for 2 reasons:

  -  CONFLICT2 and CONFLICT3 are both for the foobar line so would have to be interleaved with the input, after foobar. 
  - having the CHECK on the same line as the input means they appear in the error message and makes the error message checking directives even longer

================
Comment at: llvm/test/FileCheck/numeric-expression.txt:269-274
 DEF EXPR WRONG MATCH
 20
 43
 DEF-EXPR-FAIL-LABEL: DEF EXPR WRONG MATCH
 DEF-EXPR-FAIL-NEXT: [[# VAR20:]]
 DEF-EXPR-FAIL-NEXT: [[# VAR42: VAR20+22]]
----------------
jdenny wrote:
> Can these checks be inlined?
As above, when testing error message for CHECK directive I prefer to have them separated. Given how small is the example I don't think it's such a big deal.

================
Comment at: llvm/test/FileCheck/numeric-expression.txt:288-293
 SAME LINE USE
 3
 4 5
 SAME-LINE-USE1-LABEL: SAME LINE USE
 SAME-LINE-USE1-NEXT: [[#]]
+SAME-LINE-USE1-NEXT: [[#UNSI:]] [[#UNSI+1]]
----------------
jdenny wrote:
> Can these checks be inlined?
Ditto.

================
Comment at: llvm/test/FileCheck/numeric-expression.txt:310-315
 VAR REDEF FMT CHANGE
 22
 DC
 REDEF-NEW-FMT-LABEL: VAR REDEF FMT CHANGE
-REDEF-NEW-FMT-NEXT: [[#VAR1:]]
-REDEF-NEW-FMT-NEXT: [[#%X,VAR1:]]
+REDEF-NEW-FMT-NEXT: [[#UNSI:]]
+REDEF-NEW-FMT-NEXT: [[#%X,UNSI:]]
----------------
jdenny wrote:
> Can these checks be inlined?
Ditto.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D79820/new/

https://reviews.llvm.org/D79820