diff --git a/llvm/test/FileCheck/numeric-expression.txt b/llvm/test/FileCheck/numeric-expression.txt
--- a/llvm/test/FileCheck/numeric-expression.txt
+++ b/llvm/test/FileCheck/numeric-expression.txt
@@ -64,25 +64,24 @@
 ; Numeric expressions in explicit matching format and default matching rule using
 ; variables defined on other lines without spaces.
 USE DEF FMT IMPL MATCH
-11
-12
-10
-c
-d
-b
-1a
-D
-E
-C
-1B
-11
-11
-11
-c
-c
-c
-c
-c
+11 // VAR1
+12 // VAR1 + 1
+10 // VAR1 - 1
+c  // VAR2
+d  // VAR2 + 1
+b  // VAR2 - 1
+1a // VAR2 + 0xe
+1a // VAR2 + 0xE
+D  // VAR3
+E  // VAR3 + 1
+C  // VAR3 - 1
+1B // VAR3 + 0xe
+1B // VAR3 - oxE
+11 // VAR1a
+11 // VAR1b
+11 // VAR1c
+
+c  // VAR2a
 CHECK-LABEL: USE DEF FMT IMPL MATCH
 CHECK-NEXT: [[#%u,VAR1]]
 CHECK-NEXT: [[#%u,VAR1+1]]
@@ -90,14 +89,17 @@
 CHECK-NEXT: [[#%x,VAR2]]
 CHECK-NEXT: [[#%x,VAR2+1]]
 CHECK-NEXT: [[#%x,VAR2-1]]
-CHECK-NEXT: [[#%x,VAR2+14]]
+CHECK-NEXT: [[#%x,VAR2+0xe]]
+CHECK-NEXT: [[#%x,VAR2+0xE]]
 CHECK-NEXT: [[#%X,VAR3]]
 CHECK-NEXT: [[#%X,VAR3+1]]
 CHECK-NEXT: [[#%X,VAR3-1]]
-CHECK-NEXT: [[#%X,VAR3+14]]
+CHECK-NEXT: [[#%X,VAR3+0xe]]
+CHECK-NEXT: [[#%X,VAR3+0xE]]
 CHECK-NEXT: [[#%u,VAR1a]]
 CHECK-NEXT: [[#%u,VAR1b]]
 CHECK-NEXT: [[#%u,VAR1c]]
+CHECK-EMPTY:
 CHECK-NEXT: [[#%x,VAR2a]]
 
 ; Numeric expressions in explicit matching format and default matching rule using
@@ -138,17 +140,19 @@
 ; Numeric expressions in implicit matching format and default matching rule using
 ; variables defined on other lines.
 USE IMPL FMT IMPL MATCH
-11
-12
-10
-c
-d
-b
-1a
-D
-E
-C
-1B
+11 // VAR1
+12 // VAR1 + 1
+10 // VAR1 - 1
+c  // VAR2
+d  // VAR2 + 1
+b  // VAR2 - 1
+1a // VAR2 + 0xe
+1a // VAR2 + 0xE
+D  // VAR3
+E  // VAR3 + 1
+C  // VAR3 - 1
+1B // VAR3 + 0xe
+1B // VAR3 + 0xE
 CHECK-LABEL: USE IMPL FMT IMPL MATCH
 CHECK-NEXT: [[#VAR1]]
 CHECK-NEXT: [[#VAR1+1]]
@@ -156,11 +160,13 @@
 CHECK-NEXT: [[#VAR2]]
 CHECK-NEXT: [[#VAR2+1]]
 CHECK-NEXT: [[#VAR2-1]]
-CHECK-NEXT: [[#VAR2+14]]
+CHECK-NEXT: [[#VAR2+0xe]]
+CHECK-NEXT: [[#VAR2+0xE]]
 CHECK-NEXT: [[#VAR3]]
 CHECK-NEXT: [[#VAR3+1]]
 CHECK-NEXT: [[#VAR3-1]]
-CHECK-NEXT: [[#VAR3+14]]
+CHECK-NEXT: [[#VAR3+0xe]]
+CHECK-NEXT: [[#VAR3+0xE]]
 
 ; Numeric expressions using variables defined on other lines and an immediate
 ; interpreted as an unsigned value.
@@ -173,15 +179,19 @@
 ; Numeric expressions with matching format overriding the implicit format of
 ; variables defined on other lines.
 USE CONV FMT IMPL MATCH
-b
-B
-12
-13
+b  // %x, VAR1
+B  // %X, VAR1
+12 // %u, VAR2
+C  // %X, VAR2
+13 // %u, VAR3
+d  // %x, VAR3
 CHECK-LABEL: USE CONV FMT IMPL MATCH
 CHECK-NEXT: [[# %x, VAR1]]
 CHECK-NEXT: [[# %X, VAR1]]
 CHECK-NEXT: [[# %u, VAR2]]
+CHECK-NEXT: [[# %X, VAR2]]
 CHECK-NEXT: [[# %u, VAR3]]
+CHECK-NEXT: [[# %x, VAR3]]
 
 ; Conflicting implicit format.
 RUN: %ProtectFileCheckOutput \
@@ -385,4 +395,4 @@
 REDEF-NEW-FMT-NEXT: [[#%X,VAR1:]]
 REDEF-NEW-FMT-MSG: numeric-expression.txt:[[#@LINE-1]]:31: error: format different from previous variable definition
 REDEF-NEW-FMT-MSG-NEXT: {{R}}EDEF-NEW-FMT-NEXT: {{\[\[#%X,VAR1:\]\]}}
-REDEF-NEW-FMT-MSG-NEXT: {{^                              \^$}}
+REDEF-NEW-FMT-MSG-NEXT:    {{^}}                              ^{{$}}