From: Andreas Krebbel Date: Tue, 5 Jun 2018 08:21:57 +0000 (+0000) Subject: S/390: Fix __builtin_tbeginc signature X-Git-Tag: releases/gcc-7.4.0~428 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d36e0ed9e3913936d2c92701ee6b7f4641e0036a;p=thirdparty%2Fgcc.git S/390: Fix __builtin_tbeginc signature The builtin was accidentally defined to have an integer return value. Fixed with the attached patch. gcc/ChangeLog: 2018-06-05 Andreas Krebbel Backport from mainline 2018-06-05 Andreas Krebbel * 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 Backport from mainline 2018-06-05 Andreas Krebbel * gcc.target/s390/htm-builtins-compile-4.c: New test. From-SVN: r261190 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 864cca51459e..534bc9b91afa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2018-06-05 Andreas Krebbel + + Backport from mainline + 2018-06-05 Andreas Krebbel + + * config/s390/s390-builtin-types.def: Add void function type. + * config/s390/s390-builtins.def: Use the function type for the + tbeginc builtin. + 2018-06-01 Bill Schmidt PR tree-optimization/85712 diff --git a/gcc/config/s390/s390-builtin-types.def b/gcc/config/s390/s390-builtin-types.def index b7f33030eb9d..915b050b2fbb 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_OUV4SI, BT_UINT, 4) DEF_OPAQUE_VECTOR_TYPE (BT_BV4SI, BT_BINT, 4) 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 9046cb08f948..c2f278dc9c33 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/ChangeLog b/gcc/testsuite/ChangeLog index b5e2136a3d4b..7a8d45f23818 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2018-06-05 Andreas Krebbel + + Backport from mainline + 2018-06-05 Andreas Krebbel + + * gcc.target/s390/htm-builtins-compile-4.c: New test. + 2018-06-04 Steven G. Kargl PR fortran/85981 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 000000000000..c3866bde4a4c --- /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" } */ +}