Skip to content

R
riscv-gcc-1
Commit 56fe3ca3 by Richard Sandiford
Options

aarch64: Fix parameter passing for [[no_unique_address]] 

This patch makes the ABI code ignore zero-sized [[no_unique_address]]
fields when deciding whether something is a HFA or HVA.

As things stood, we'd get two sets of -Wpsabi warnings, one when
trying to decide whether something was an SVE function, and another
when actually processing the function definition or function call.
The patch therefore makes aapcs_vfp_sub_candidate honour the
CUMULATIVE_ARGS "silent_p" flag where applicable.

This doesn't stop all duplicate warnings for parameters, and I suspect
we'll get duplicate warnings for return values too, but it should be
better than nothing.

2020-04-29  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* config/aarch64/aarch64.c (aarch64_function_arg_alignment): Add a
	comment explaining why we consider even zero-sized fields.
	(WARN_PSABI_EMPTY_CXX17_BASE): New constant.
	(WARN_PSABI_NO_UNIQUE_ADDRESS): Likewise.
	(aapcs_vfp_sub_candidate): Replace the boolean pointer parameter
	avoid_cxx17_empty_base with a pointer to a bitmask.  Ignore fields
	whose DECL_FIELD_ABI_IGNORED bit is set when determining whether
	something actually is a HFA or HVA.  Record whether we see a
	[[no_unique_address]] field that previous GCCs would not have
	ignored in this way.
	(aarch64_vfp_is_call_or_return_candidate): Add a parameter to say
	whether diagnostics should be suppressed.  Update the calls to
	aapcs_vfp_sub_candidate and report a -Wpsabi warning for the
	[[no_unique_address]] case.
	(aarch64_return_in_msb): Update call accordingly, never silencing
	diagnostics.
	(aarch64_function_value): Likewise.
	(aarch64_return_in_memory_1): Likewise.
	(aarch64_init_cumulative_args): Likewise.
	(aarch64_gimplify_va_arg_expr): Likewise.
	(aarch64_pass_by_reference_1): Take a CUMULATIVE_ARGS pointer and
	use it to decide whether arch64_vfp_is_call_or_return_candidate
	should be silent.
	(aarch64_pass_by_reference): Update calls accordingly.
	(aarch64_vfp_is_call_candidate): Use the CUMULATIVE_ARGS argument
	to decide whether arch64_vfp_is_call_or_return_candidate should be
	silent.

gcc/testsuite/
	* g++.target/aarch64/no_unique_address_1.C: New test.
	* g++.target/aarch64/no_unique_address_2.C: Likewise.
parent b5620fad
Showing with 447 additions and 0 deletions
gcc/ChangeLog
2020-04-29 Richard Sandiford <richard.sandiford@arm.com>
* config/aarch64/aarch64.c (aarch64_function_arg_alignment): Add a
comment explaining why we consider even zero-sized fields.
(WARN_PSABI_EMPTY_CXX17_BASE): New constant.
(WARN_PSABI_NO_UNIQUE_ADDRESS): Likewise.
(aapcs_vfp_sub_candidate): Replace the boolean pointer parameter
avoid_cxx17_empty_base with a pointer to a bitmask. Ignore fields
whose DECL_FIELD_ABI_IGNORED bit is set when determining whether
something actually is a HFA or HVA. Record whether we see a
[[no_unique_address]] field that previous GCCs would not have
ignored in this way.
(aarch64_vfp_is_call_or_return_candidate): Add a parameter to say
whether diagnostics should be suppressed. Update the calls to
aapcs_vfp_sub_candidate and report a -Wpsabi warning for the
[[no_unique_address]] case.
(aarch64_return_in_msb): Update call accordingly, never silencing
diagnostics.
(aarch64_function_value): Likewise.
(aarch64_return_in_memory_1): Likewise.
(aarch64_init_cumulative_args): Likewise.
(aarch64_gimplify_va_arg_expr): Likewise.
(aarch64_pass_by_reference_1): Take a CUMULATIVE_ARGS pointer and
use it to decide whether arch64_vfp_is_call_or_return_candidate
should be silent.
(aarch64_pass_by_reference): Update calls accordingly.
(aarch64_vfp_is_call_candidate): Use the CUMULATIVE_ARGS argument
to decide whether arch64_vfp_is_call_or_return_candidate should be
silent.
2020-04-29 Haijian Zhang <z.zhanghaijian@huawei.com>
PR target/94820
......
gcc/testsuite/ChangeLog
2020-04-29 Richard Sandiford <richard.sandiford@arm.com>
* g++.target/aarch64/no_unique_address_1.C: New test.
* g++.target/aarch64/no_unique_address_2.C: Likewise.
2020-04-29 Richard Sandiford <richard.sandiford@arm.com>
* g++.target/arm/mve.exp: Restore the original dg-do-what-default
before finishing.
......
gcc/testsuite/g++.target/aarch64/no_unique_address_1.C 0 → 100644
/* { dg-options "-std=c++11 -O -foptimize-sibling-calls -fpeephole2" } */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } } } */
struct X { };
struct Y { int : 0; };
struct Z { int : 0; Y y; };
struct W : public X { X q; };
struct A { float a; };
struct B : public X { float a; };
struct C : public Y { float a; };
struct D : public Z { float a; };
struct E : public W { float a; };
struct F { [[no_unique_address]] X x; float a; };
struct G { [[no_unique_address]] Y y; float a; };
struct H { [[no_unique_address]] Z z; float a; };
struct I { [[no_unique_address]] W w; float a; };
struct J { float a; [[no_unique_address]] X x; float b; };
struct K { float a; [[no_unique_address]] Y y; float b; };
struct L { float a; [[no_unique_address]] Z z; float b; };
struct M { float a; [[no_unique_address]] W w; float b; };
struct N : public A { float b; };
struct O { [[no_unique_address]] A a; float b; };
struct P : public Y { int : 0; float a, b, c, d; };
union Q { X x; float a; };
union R { [[no_unique_address]] X x; float a; };
union S { A a; float b; };
union T { F f; float b; };
union U { N n; O o; };
typedef S Salias;
typedef T Talias;
typedef U Ualias;
#define T(S, s) extern int callee_##s (S)
/*
** _Z8caller_aR1A:
** ldr s0, \[x0\]
** b .*
*/
T (A, a); int caller_a (A &a) { return callee_a (a); } /* { dg-bogus {argument of type 'A'} } */
/*
** _Z8caller_bR1B:
** ldr s0, \[x0\]
** b .*
*/
T (B, b); int caller_b (B &b) { return callee_b (b); } /* { dg-bogus {argument of type 'B'} } */
/*
** _Z8caller_cR1C:
** ldr s0, \[x0\]
** b .*
*/
T (C, c); int caller_c (C &c) { return callee_c (c); } /* { dg-bogus {argument of type 'C'} } */
/*
** _Z8caller_dR1D:
** ldr x0, \[x0\]
** b .*
*/
T (D, d); int caller_d (D &d) { return callee_d (d); } /* { dg-bogus {argument of type 'D'} } */
/*
** _Z8caller_eR1E:
** ldr x0, \[x0\]
** b .*
*/
T (E, e); int caller_e (E &e) { return callee_e (e); } /* { dg-bogus {argument of type 'E'} } */
/*
** _Z8caller_fR1F:
** ldr s0, \[x0\]
** b .*
*/
T (F, f); int caller_f (F &f) { return callee_f (f); } /* { dg-message {parameter passing for argument of type 'F' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_gR1G:
** ldr s0, \[x0\]
** b .*
*/
T (G, g); int caller_g (G &g) { return callee_g (g); } /* { dg-message {parameter passing for argument of type 'G' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_hR1H:
** ldr x0, \[x0\]
** b .*
*/
T (H, h); int caller_h (H &h) { return callee_h (h); } /* { dg-bogus {argument of type 'H'} } */
/*
** _Z8caller_iR1I:
** ldr x0, \[x0\]
** b .*
*/
T (I, i); int caller_i (I &i) { return callee_i (i); } /* { dg-bogus {argument of type 'I'} } */
/*
** _Z8caller_jR1J:
** ldp s0, s1, \[x0\]
** b .*
*/
T (J, j); int caller_j (J &j) { return callee_j (j); } /* { dg-message {parameter passing for argument of type 'J' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_kR1K:
** ldp s0, s1, \[x0\]
** b .*
*/
T (K, k); int caller_k (K &k) { return callee_k (k); } /* { dg-message {parameter passing for argument of type 'K' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_lR1L: { target aarch64_little_endian }
** (
** ldr w1, \[x0, 8\]
** ldr x0, \[x0\]
** |
** mov (x[0-9]+), x0
** ldr x0, \[x0\]
** ldr w1, \[\1, 8\]
** )
** b .*
*/
T (L, l); int caller_l (L &l) { return callee_l (l); } /* { dg-bogus {argument of type 'L'} } */
/*
** _Z8caller_mR1M: { target aarch64_little_endian }
** (
** ldr w1, \[x0, 8\]
** ldr x0, \[x0\]
** |
** mov (x[0-9]+), x0
** ldr x0, \[x0\]
** ldr w1, \[\1, 8\]
** )
** b .*
*/
T (M, m); int caller_m (M &m) { return callee_m (m); } /* { dg-bogus {argument of type 'M'} } */
/*
** _Z8caller_nR1N:
** ldp s0, s1, \[x0\]
** b .*
*/
T (N, n); int caller_n (N &n) { return callee_n (n); } /* { dg-bogus {argument of type 'N'} } */
/*
** _Z8caller_oR1O:
** ldp s0, s1, \[x0\]
** b .*
*/
T (O, o); int caller_o (O &o) { return callee_o (o); } /* { dg-bogus {argument of type 'O'} } */
/*
** _Z8caller_pR1P:
** ldp s0, s1, \[x0\]
** ldp s2, s3, \[x0, 8\]
** b .*
*/
T (P, p); int caller_p (P &p) { return callee_p (p); } /* { dg-bogus {argument of type 'P'} } */
/*
** _Z8caller_qR1Q: { target aarch64_little_endian }
** ldr w0, \[x0\]
** b .*
*/
T (Q, q); int caller_q (Q &q) { return callee_q (q); } /* { dg-bogus {argument of type 'Q'} } */
/*
** _Z8caller_rR1R: { target aarch64_little_endian }
** ldr w0, \[x0\]
** b .*
*/
T (R, r); int caller_r (R &r) { return callee_r (r); } /* { dg-bogus {argument of type 'R'} } */
/*
** _Z8caller_sR1S:
** ldr s0, \[x0\]
** b .*
*/
T (Salias, s); int caller_s (Salias &s) { return callee_s (s); } /* { dg-bogus {argument of type 'S'} } */
/*
** _Z8caller_tR1T:
** ldr s0, \[x0\]
** b .*
*/
T (Talias, t); int caller_t (Talias &t) { return callee_t (t); } /* { dg-message {parameter passing for argument of type 'T' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_uR1U:
** ldp s0, s1, \[x0\]
** b .*
*/
T (Ualias, u); int caller_u (Ualias &u) { return callee_u (u); } /* { dg-bogus {argument of type 'U'} } */
/* { dg-bogus {argument of type 'const} "should not be printed as const" { target *-*-*} 0 } */
gcc/testsuite/g++.target/aarch64/no_unique_address_2.C 0 → 100644
/* { dg-options "-std=c++17 -O -foptimize-sibling-calls -fpeephole2" } */
/* { dg-final { check-function-bodies "**" "" "" { target lp64 } } } */
struct X { };
struct Y { int : 0; };
struct Z { int : 0; Y y; };
struct W : public X { X q; };
struct A { float a; };
struct B : public X { float a; };
struct C : public Y { float a; };
struct D : public Z { float a; };
struct E : public W { float a; };
struct F { [[no_unique_address]] X x; float a; };
struct G { [[no_unique_address]] Y y; float a; };
struct H { [[no_unique_address]] Z z; float a; };
struct I { [[no_unique_address]] W w; float a; };
struct J { float a; [[no_unique_address]] X x; float b; };
struct K { float a; [[no_unique_address]] Y y; float b; };
struct L { float a; [[no_unique_address]] Z z; float b; };
struct M { float a; [[no_unique_address]] W w; float b; };
struct N : public A { float b; };
struct O { [[no_unique_address]] A a; float b; };
struct P : public Y { int : 0; float a, b, c, d; };
union Q { X x; float a; };
union R { [[no_unique_address]] X x; float a; };
union S { A a; float b; };
union T { F f; float b; };
union U { N n; O o; };
typedef S Salias;
typedef T Talias;
typedef U Ualias;
#define T(S, s) extern int callee_##s (S)
/*
** _Z8caller_aR1A:
** ldr s0, \[x0\]
** b .*
*/
T (A, a); int caller_a (A &a) { return callee_a (a); } /* { dg-bogus {argument of type 'A'} } */
/*
** _Z8caller_bR1B:
** ldr s0, \[x0\]
** b .*
*/
T (B, b); int caller_b (B &b) { return callee_b (b); } /* { dg-message {parameter passing for argument of type 'B' when C\+\+17 is enabled changed to match C\+\+14 in GCC 10.1} } */
/*
** _Z8caller_cR1C:
** ldr s0, \[x0\]
** b .*
*/
T (C, c); int caller_c (C &c) { return callee_c (c); } /* { dg-message {parameter passing for argument of type 'C' when C\+\+17 is enabled changed to match C\+\+14 in GCC 10.1} } */
/*
** _Z8caller_dR1D:
** ldr x0, \[x0\]
** b .*
*/
T (D, d); int caller_d (D &d) { return callee_d (d); } /* { dg-bogus {argument of type 'D'} } */
/*
** _Z8caller_eR1E:
** ldr x0, \[x0\]
** b .*
*/
T (E, e); int caller_e (E &e) { return callee_e (e); } /* { dg-bogus {argument of type 'E'} } */
/*
** _Z8caller_fR1F:
** ldr s0, \[x0\]
** b .*
*/
T (F, f); int caller_f (F &f) { return callee_f (f); } /* { dg-message {parameter passing for argument of type 'F' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_gR1G:
** ldr s0, \[x0\]
** b .*
*/
T (G, g); int caller_g (G &g) { return callee_g (g); } /* { dg-message {parameter passing for argument of type 'G' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_hR1H:
** ldr x0, \[x0\]
** b .*
*/
T (H, h); int caller_h (H &h) { return callee_h (h); } /* { dg-bogus {argument of type 'H'} } */
/*
** _Z8caller_iR1I:
** ldr x0, \[x0\]
** b .*
*/
T (I, i); int caller_i (I &i) { return callee_i (i); } /* { dg-bogus {argument of type 'I'} } */
/*
** _Z8caller_jR1J:
** ldp s0, s1, \[x0\]
** b .*
*/
T (J, j); int caller_j (J &j) { return callee_j (j); } /* { dg-message {parameter passing for argument of type 'J' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_kR1K:
** ldp s0, s1, \[x0\]
** b .*
*/
T (K, k); int caller_k (K &k) { return callee_k (k); } /* { dg-message {parameter passing for argument of type 'K' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_lR1L: { target aarch64_little_endian }
** (
** ldr w1, \[x0, 8\]
** ldr x0, \[x0\]
** |
** mov (x[0-9]+), x0
** ldr x0, \[x0\]
** ldr w1, \[\1, 8\]
** )
** b .*
*/
T (L, l); int caller_l (L &l) { return callee_l (l); } /* { dg-bogus {argument of type 'L'} } */
/*
** _Z8caller_mR1M: { target aarch64_little_endian }
** (
** ldr w1, \[x0, 8\]
** ldr x0, \[x0\]
** |
** mov (x[0-9]+), x0
** ldr x0, \[x0\]
** ldr w1, \[\1, 8\]
** )
** b .*
*/
T (M, m); int caller_m (M &m) { return callee_m (m); } /* { dg-bogus {argument of type 'M'} } */
/*
** _Z8caller_nR1N:
** ldp s0, s1, \[x0\]
** b .*
*/
T (N, n); int caller_n (N &n) { return callee_n (n); } /* { dg-bogus {argument of type 'N'} } */
/*
** _Z8caller_oR1O:
** ldp s0, s1, \[x0\]
** b .*
*/
T (O, o); int caller_o (O &o) { return callee_o (o); } /* { dg-bogus {argument of type 'O'} } */
/*
** _Z8caller_pR1P:
** ldp s0, s1, \[x0\]
** ldp s2, s3, \[x0, 8\]
** b .*
*/
T (P, p); int caller_p (P &p) { return callee_p (p); } /* { dg-message {parameter passing for argument of type 'P' when C\+\+17 is enabled changed to match C\+\+14 in GCC 10.1} } */
/*
** _Z8caller_qR1Q: { target aarch64_little_endian }
** ldr w0, \[x0\]
** b .*
*/
T (Q, q); int caller_q (Q &q) { return callee_q (q); } /* { dg-bogus {argument of type 'Q'} } */
/*
** _Z8caller_rR1R: { target aarch64_little_endian }
** ldr w0, \[x0\]
** b .*
*/
T (R, r); int caller_r (R &r) { return callee_r (r); } /* { dg-bogus {argument of type 'R'} } */
/*
** _Z8caller_sR1S:
** ldr s0, \[x0\]
** b .*
*/
T (Salias, s); int caller_s (Salias &s) { return callee_s (s); } /* { dg-bogus {argument of type 'S'} } */
/*
** _Z8caller_tR1T:
** ldr s0, \[x0\]
** b .*
*/
T (Talias, t); int caller_t (Talias &t) { return callee_t (t); } /* { dg-message {parameter passing for argument of type 'T' with '\[\[no_unique_address\]\]' members changed in GCC 10.1} } */
/*
** _Z8caller_uR1U:
** ldp s0, s1, \[x0\]
** b .*
*/
T (Ualias, u); int caller_u (Ualias &u) { return callee_u (u); } /* { dg-bogus {argument of type 'U'} } */
/* { dg-bogus {argument of type 'const} "should not be printed as const" { target *-*-*} 0 } */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment