The builtin was accidentally defined to have an integer return value.
Fixed with the attached patch.
Bootstrapped and regression tested on s390x. Applied to mainline, 8,
7, and 6 branches.
gcc/ChangeLog:
2018-06-05 Andreas Krebbel <kreb...@linux.ibm.com>
* config/s390/s390-builtin-types.def: Add void function type.
* config/s390/s390-builtins.def: Use the function type for the
tbeginc builtin.
gcc/testsuite/ChangeLog:
2018-06-05 Andreas Krebbel <kreb...@linux.ibm.com>
* gcc.target/s390/htm-builtins-compile-4.c: New test.
---
gcc/config/s390/s390-builtin-types.def | 1 +
gcc/config/s390/s390-builtins.def | 2 +-
gcc/testsuite/gcc.target/s390/htm-builtins-compile-4.c | 10 ++++++++++
3 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.target/s390/htm-builtins-compile-4.c
diff --git a/gcc/config/s390/s390-builtin-types.def
b/gcc/config/s390/s390-builtin-types.def
index 260ad93..2acc55f 100644
--- a/gcc/config/s390/s390-builtin-types.def
+++ b/gcc/config/s390/s390-builtin-types.def
@@ -124,6 +124,7 @@ DEF_OPAQUE_VECTOR_TYPE (BT_BV8HI, BT_BSHORT, 8)
DEF_OPAQUE_VECTOR_TYPE (BT_OV2DI, BT_LONGLONG, 2)
DEF_FN_TYPE_0 (BT_FN_INT, BT_INT)
DEF_FN_TYPE_0 (BT_FN_UINT, BT_UINT)
+DEF_FN_TYPE_0 (BT_FN_VOID, BT_VOID)
DEF_FN_TYPE_1 (BT_FN_INT_INT, BT_INT, BT_INT)
DEF_FN_TYPE_1 (BT_FN_INT_VOIDPTR, BT_INT, BT_VOIDPTR)
DEF_FN_TYPE_1 (BT_FN_OV4SI_INT, BT_OV4SI, BT_INT)
diff --git a/gcc/config/s390/s390-builtins.def
b/gcc/config/s390/s390-builtins.def
index cf174b5..49caa01 100644
--- a/gcc/config/s390/s390-builtins.def
+++ b/gcc/config/s390/s390-builtins.def
@@ -294,7 +294,7 @@
flags: Flags applying to all its variants should be mentioned in the OB_DEF
line instead. */
-B_DEF (tbeginc, tbeginc, 0,
B_HTM, 0, BT_FN_INT)
+B_DEF (tbeginc, tbeginc, 0,
B_HTM, 0, BT_FN_VOID)
B_DEF (tbegin, tbegin,
returns_twice_attr, B_HTM, 0, BT_FN_INT_VOIDPTR)
B_DEF (tbegin_nofloat, tbegin_nofloat,
returns_twice_attr, B_HTM, 0, BT_FN_INT_VOIDPTR)
B_DEF (tbegin_retry, tbegin_retry,
returns_twice_attr, B_HTM, 0,
BT_FN_INT_VOIDPTR_INT)
diff --git a/gcc/testsuite/gcc.target/s390/htm-builtins-compile-4.c
b/gcc/testsuite/gcc.target/s390/htm-builtins-compile-4.c
new file mode 100644
index 0000000..c3866bd
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/htm-builtins-compile-4.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=zEC12 -mzarch" } */
+
+/* A bug in the builtin definition made__builtin_tbeginc to have an
+ integer return argument. */
+void
+must_not_compile1 (void)
+{
+ int rc = __builtin_tbeginc (); /* { dg-error "void value not ignored as it
ought to be" } */
+}
--
2.9.1
