commit 8d233b16cb6607a4252c4e49afa978e90d305d8e
author Slava Pestov <sviatoslav.pestov@gmail.com> Sun Apr 16 15:25:08 2017 -0700
committer GitHub <noreply@github.com> Sun Apr 16 15:25:08 2017 -0700
tree cb9ff161ddc914bbd61f7d71cd4231d729b20ac5
parent 2c17dff273e875f8aa75f943c4e92bacf19e0f22
parent ec16e968fcaaca0dadc3f8db7edcabc690e98d03

Merge pull request #8720 from linux-on-ibm-z/swift31-condfail-fix

Fix IRGen/condfail.sil on s390x

test/IRGen/condfail.sil

diff --git a/test/IRGen/condfail.sil b/test/IRGen/condfail.sil
index df85753..cc0b117 100644
--- a/test/IRGen/condfail.sil
+++ b/test/IRGen/condfail.sil
@@ -31,7 +31,7 @@
 // CHECK-armv7s:      trap
 // CHECK-powerpc64:   trap
 // CHECK-powerpc64le: trap
-// CHECK-s390x:       trap
+// CHECK-s390x:       j       .Ltmp{{[0-9]+}}+2
 // CHECK-NOT-x86_64:      .cfi_endproc
 // CHECK-NOT-i386:        .cfi_endproc
 // CHECK-NOT-arm64:       .cfi_endproc
@@ -55,7 +55,7 @@
 // CHECK-armv7s:      trap
 // CHECK-powerpc64:   trap
 // CHECK-powerpc64le: trap
-// CHECK-s390x:       trap
+// CHECK-s390x:       j       .Ltmp{{[0-9]+}}+2
 // CHECK-x86_64:      .cfi_endproc
 // CHECK-i386:        .cfi_endproc
 // CHECK-arm64:       .cfi_endproc