From 54de5afb4a9b2f7296f614820a33ec0e4eb8bf39 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 27 Mar 2020 22:29:50 +0100 Subject: [PATCH] c++: Handle COMPOUND_EXPRs in ocp_convert [PR94339] With the PR94346 fix in, we can revert the attr-copy-2.C workaround. 2020-03-27 Jakub Jelinek PR c++/94339 * g++.dg/ext/attr-copy-2.C: Revert the last changes. --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/ext/attr-copy-2.C | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 65d953c3277..7876b57deeb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-03-27 Jakub Jelinek + + PR c++/94339 + * g++.dg/ext/attr-copy-2.C: Revert the last changes. + 2020-03-27 Martin Sebor PR c++/94346 diff --git a/gcc/testsuite/g++.dg/ext/attr-copy-2.C b/gcc/testsuite/g++.dg/ext/attr-copy-2.C index 7c47a1554c4..7776959d9f6 100644 --- a/gcc/testsuite/g++.dg/ext/attr-copy-2.C +++ b/gcc/testsuite/g++.dg/ext/attr-copy-2.C @@ -36,8 +36,8 @@ typedef struct C ATTR (copy (*(struct A *)(0, 1))) long m_xpa_0_1; ATTR (copy (((struct A *)0)[0])) short m_arpa_0; -// ATTR (copy (((struct A *)(1, 0))[0])) int m_arpa_1_0; -// ATTR (copy (((struct A *)(0, 1))[0])) long m_arpa_0_1; + ATTR (copy (((struct A *)(1, 0))[0])) int m_arpa_1_0; + ATTR (copy (((struct A *)(0, 1))[0])) long m_arpa_0_1; ATTR (copy (a)) short m_a; ATTR (copy (b.a)) int m_b_a; @@ -86,8 +86,8 @@ static_assert (__builtin_has_attribute (((C*)0)->m_xpa_0_1, packed)); static_assert (__builtin_has_attribute (((C*)0)->m_ra, packed)); static_assert (__builtin_has_attribute (((C*)0)->m_arpa_0, packed)); -//static_assert (__builtin_has_attribute (((C*)0)->m_arpa_1_0, packed)); -//static_assert (__builtin_has_attribute (((C*)0)->m_arpa_0_1, packed)); +static_assert (__builtin_has_attribute (((C*)0)->m_arpa_1_0, packed)); +static_assert (__builtin_has_attribute (((C*)0)->m_arpa_0_1, packed)); static_assert (__builtin_has_attribute (((C*)0)->m_a, packed)); static_assert (__builtin_has_attribute (((C*)0)->m_b_a, packed)); -- 2.30.2