From 8ed6f54304aac6a08b6d14663cbe46e3c47ce25e Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Fri, 9 Feb 2018 09:50:14 +0000 Subject: [PATCH] * expr.c (optimize_bitfield_assignment_op): Remove obsolete assertion. From-SVN: r257519 --- gcc/ChangeLog | 4 ++++ gcc/expr.c | 2 -- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gnat.dg/sso8.adb | 15 ++++++++++++++ gcc/testsuite/gnat.dg/sso8_pkg.ads | 32 ++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/sso8.adb create mode 100644 gcc/testsuite/gnat.dg/sso8_pkg.ads diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f255810e18b..7ed08fa7586 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2018-02-09 Eric Botcazou + + * expr.c (optimize_bitfield_assignment_op): Remove obsolete assertion. + 2018-02-09 Jakub Jelinek PR sanitizer/84285 diff --git a/gcc/expr.c b/gcc/expr.c index 36a6c722980..876883e4374 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -4726,8 +4726,6 @@ optimize_bitfield_assignment_op (poly_uint64 pbitsize, } else if (!REG_P (str_rtx) && GET_CODE (str_rtx) != SUBREG) return false; - else - gcc_assert (!reverse); /* If the bit field covers the whole REG/MEM, store_field will likely generate better code. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8772c42c897..544ebefe0b6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-09 Eric Botcazou + + * gnat.dg/sso8.adb: New test. + * gnat.dg/sso8_pkg.ads: New helper. + 2018-02-09 Richard Biener PR tree-optimization/84278 diff --git a/gcc/testsuite/gnat.dg/sso8.adb b/gcc/testsuite/gnat.dg/sso8.adb new file mode 100644 index 00000000000..003077ce166 --- /dev/null +++ b/gcc/testsuite/gnat.dg/sso8.adb @@ -0,0 +1,15 @@ +-- { dg-do run } +-- { dg-options "-O" } + +with Interfaces; use Interfaces; +with SSO8_Pkg; use SSO8_Pkg; + +procedure SSO8 is + Data : Rec; +begin + Data.Array_Data (2) := True; + Val8 := Conv (Data); + if Val8 /= 32 then + raise Program_Error; + end if; +end; diff --git a/gcc/testsuite/gnat.dg/sso8_pkg.ads b/gcc/testsuite/gnat.dg/sso8_pkg.ads new file mode 100644 index 00000000000..e9227e6c859 --- /dev/null +++ b/gcc/testsuite/gnat.dg/sso8_pkg.ads @@ -0,0 +1,32 @@ +with Interfaces; +with System; +with Unchecked_Conversion; + +package SSO8_Pkg is + + Val8 : Interfaces.Unsigned_8; + + type Two_Bit_Int is range 0 .. 3; + for Two_Bit_Int'size use 2; + + type Arr is array (1 .. 5) of Boolean; + for Arr'scalar_storage_order use System.High_Order_First; + pragma Pack (Arr); + + type Rec is record + Boolean_Data : Boolean; + Array_Data : Arr; + Two_Bit_Data : Two_Bit_Int; + end record; + for Rec use record + Boolean_Data at 0 range 0 .. 0; + Array_Data at 0 range 1 .. 5; + Two_Bit_Data at 0 range 6 .. 7; + end record; + for Rec'size use 8; + for Rec'bit_order use System.High_Order_First; + for Rec'scalar_storage_order use System.High_Order_First; + + function Conv is new Unchecked_Conversion (Rec, Interfaces.Unsigned_8); + +end SSO8_Pkg; -- 2.30.2