Fix accidental FileCheck variable captures.

Mark Lacey · Mark Lacey · commit 88b2ed952bda · 2015-12-03T15:38:01.000-08:00
These should be simple substitutions rather than captures, so that we're
actually testing the capture from the previous line.

Noticed by inspection.
diff --git a/test/SILPasses/constant_propagation.sil b/test/SILPasses/constant_propagation.sil
@@ -38,7 +38,7 @@ bb0:
 // CHECK-NOT: integer_literal $Builtin.Int64, 0
 // CHECK-NOT: builtin
 // CHECK: [[RES:%.*]] = integer_literal $Builtin.Int64, 7
-// CHECK-NEXT: return [[RES:%.*]] : $Builtin.Int64
+// CHECK-NEXT: return [[RES]] : $Builtin.Int64
 }
 
 // Fold casts. (This test assumes that DCE does not run, otherwise the unreachable blocks will get removed.)
diff --git a/test/SILPasses/sil_simplify_instrs.sil b/test/SILPasses/sil_simplify_instrs.sil
@@ -56,7 +56,7 @@ bb0(%x : $Builtin.Int64):
 // CHECK-LABEL: sil @fold_mul_with_overflow_zeros
 // CHECK-NOT: builtin "int_smul_with_overflow_Int64"
 // CHECK: [[RES:%.*]] = integer_literal $Builtin.Int64, 0
-// CHECK-NEXT: return [[RES:%.*]] : $Builtin.Int64
+// CHECK-NEXT: return [[RES]] : $Builtin.Int64
 }
 
 // Simplify arithmetic where one operand is a one and the other is not a constant

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ bb0:`
`38`	`38`	`// CHECK-NOT: integer_literal $Builtin.Int64, 0`
`39`	`39`	`// CHECK-NOT: builtin`
`40`	`40`	`// CHECK: [[RES:%.*]] = integer_literal $Builtin.Int64, 7`
`41`		`-// CHECK-NEXT: return [[RES:%.*]] : $Builtin.Int64`
	`41`	`+// CHECK-NEXT: return [[RES]] : $Builtin.Int64`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// Fold casts. (This test assumes that DCE does not run, otherwise the unreachable blocks will get removed.)`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ bb0(%x : $Builtin.Int64):`
`56`	`56`	`// CHECK-LABEL: sil @fold_mul_with_overflow_zeros`
`57`	`57`	`// CHECK-NOT: builtin "int_smul_with_overflow_Int64"`
`58`	`58`	`// CHECK: [[RES:%.*]] = integer_literal $Builtin.Int64, 0`
`59`		`-// CHECK-NEXT: return [[RES:%.*]] : $Builtin.Int64`
	`59`	`+// CHECK-NEXT: return [[RES]] : $Builtin.Int64`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`// Simplify arithmetic where one operand is a one and the other is not a constant`