From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id EA9EC3858281; Mon, 11 Dec 2023 19:33:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA9EC3858281 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1702323181; bh=/Plq4k6FG6dL4CDHnN+JHhbsbz2JzzqONBNKmEgquRo=; h=From:To:Subject:Date:From; b=VtRVD5w8tYKn+Ash9UX7qYLafm9pc8yXB+q1lGlyzHiSDTKsaBNyqMxkUYoRWSS97 2FiOcKDpVJ4ZytfoUpHIbV4t/mEiS4XgiHzeyKwCH2c7hHUnEw/M03hzWvkS8ZwkWw i1MZ3gjjLRXd59xBSrGibFi/wRtaEoKfchpKj56I= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] strub: handle volatile promoted args in internal strub X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: a8a3d832e609501002dee54150abfd96a28fe532 X-Git-Newrev: ee1d376e6d2d6f45a59e6f9319423fbc397899e2 Message-Id: <20231211193301.EA9EC3858281@sourceware.org> Date: Mon, 11 Dec 2023 19:33:01 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ee1d376e6d2d6f45a59e6f9319423fbc397899e2 commit ee1d376e6d2d6f45a59e6f9319423fbc397899e2 Author: Alexandre Oliva Date: Mon Dec 11 15:17:03 2023 -0300 strub: handle volatile promoted args in internal strub Diff: --- gcc/ipa-strub.cc | 29 ++++++++++++++++------ .../c-c++-common/strub-internal-volatile.c | 10 ++++++++ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/gcc/ipa-strub.cc b/gcc/ipa-strub.cc index 8ec6824e8a8..45294b0b46b 100644 --- a/gcc/ipa-strub.cc +++ b/gcc/ipa-strub.cc @@ -3203,7 +3203,6 @@ pass_ipa_strub::execute (function *) i++, arg = DECL_CHAIN (arg), nparm = DECL_CHAIN (nparm)) { tree save_arg = arg; - tree tmp = arg; /* Arrange to pass indirectly the parms, if we decided to do so, and revert its type in the wrapper. */ @@ -3211,10 +3210,9 @@ pass_ipa_strub::execute (function *) { tree ref_type = TREE_TYPE (nparm); TREE_ADDRESSABLE (arg) = true; - tree addr = build1 (ADDR_EXPR, ref_type, arg); - tmp = arg = addr; + arg = build1 (ADDR_EXPR, ref_type, arg); } - else + else if (!TREE_THIS_VOLATILE (arg)) DECL_NOT_GIMPLE_REG_P (arg) = 0; /* Convert the argument back to the type used by the calling @@ -3223,16 +3221,31 @@ pass_ipa_strub::execute (function *) double to be passed on unchanged to the wrapped function. */ if (TREE_TYPE (nparm) != DECL_ARG_TYPE (nparm)) - arg = fold_convert (DECL_ARG_TYPE (nparm), arg); + { + tree tmp = arg; + /* If ARG is e.g. volatile, we must copy and + convert in separate statements. ??? Should + we drop volatile from the wrapper + instead? */ + if (!is_gimple_val (arg)) + { + tmp = create_tmp_reg (TYPE_MAIN_VARIANT + (TREE_TYPE (arg)), "arg"); + gimple *stmt = gimple_build_assign (tmp, arg); + gsi_insert_after (&bsi, stmt, GSI_NEW_STMT); + } + arg = fold_convert (DECL_ARG_TYPE (nparm), tmp); + } if (!is_gimple_val (arg)) { - tmp = create_tmp_reg (TYPE_MAIN_VARIANT - (TREE_TYPE (arg)), "arg"); + tree tmp = create_tmp_reg (TYPE_MAIN_VARIANT + (TREE_TYPE (arg)), "arg"); gimple *stmt = gimple_build_assign (tmp, arg); gsi_insert_after (&bsi, stmt, GSI_NEW_STMT); + arg = tmp; } - vargs.quick_push (tmp); + vargs.quick_push (arg); arg = save_arg; } /* These strub arguments are adjusted later. */ diff --git a/gcc/testsuite/c-c++-common/strub-internal-volatile.c b/gcc/testsuite/c-c++-common/strub-internal-volatile.c new file mode 100644 index 00000000000..cdfca67616b --- /dev/null +++ b/gcc/testsuite/c-c++-common/strub-internal-volatile.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target strub } */ + +void __attribute__ ((strub("internal"))) +f(volatile short) { +} + +void g(void) { + f(0); +}