From a1aa17011f52bffc0f3022bc32d87222270dfb8b Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 20 Oct 2009 09:19:17 +0000 Subject: [PATCH] tree-sra.c (build_ref_for_offset_1): Skip fields without size or with size that can't be represented as a host integer. * tree-sra.c (build_ref_for_offset_1) : Skip fields without size or with size that can't be represented as a host integer. From-SVN: r153008 --- gcc/ChangeLog | 5 ++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gnat.dg/discr21.adb | 34 +++++++++++++++++++++++++++ gcc/testsuite/gnat.dg/discr21.ads | 5 ++++ gcc/testsuite/gnat.dg/discr21_pkg.ads | 19 +++++++++++++++ gcc/tree-sra.c | 5 +++- 6 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gnat.dg/discr21.adb create mode 100644 gcc/testsuite/gnat.dg/discr21.ads create mode 100644 gcc/testsuite/gnat.dg/discr21_pkg.ads diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 17e513fd959..739cdb574be 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-10-20 Eric Botcazou + + * tree-sra.c (build_ref_for_offset_1) : Skip fields + without size or with size that can't be represented as a host integer. + 2009-10-20 Alexandre Oliva * tree-ssa-dce.c (eliminate_unnecessary_stmts): Don't regard diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e0d007a3234..1868e09da72 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-10-20 Eric Botcazou + + * gnat.dg/discr21.ad[sb]: New test. + * gnat.dg/discr21_pkg.ads: New helper. + 2009-10-20 Paul Thomas PR fortran/41706 diff --git a/gcc/testsuite/gnat.dg/discr21.adb b/gcc/testsuite/gnat.dg/discr21.adb new file mode 100644 index 00000000000..5c105cdb25c --- /dev/null +++ b/gcc/testsuite/gnat.dg/discr21.adb @@ -0,0 +1,34 @@ +-- { dg-do compile } +-- { dg-options "-gnatws -O3" } + +with Discr21_Pkg; use Discr21_Pkg; + +package body Discr21 is + + type Index is new Natural range 0 .. 100; + + type Arr is array (Index range <> ) of Position; + + type Rec(Size : Index := 1) is record + A : Arr(1 .. Size); + end record; + + Data : Rec; + + function To_V(pos : Position) return VPosition is + begin + return To_Position(pos.x, pos.y, pos.z); + end; + + procedure Read(Data : Rec) is + pos : VPosition := To_V (Data.A(1)); + begin + null; + end; + + procedure Test is + begin + Read (Data); + end; + +end Discr21; diff --git a/gcc/testsuite/gnat.dg/discr21.ads b/gcc/testsuite/gnat.dg/discr21.ads new file mode 100644 index 00000000000..8de8ed08b76 --- /dev/null +++ b/gcc/testsuite/gnat.dg/discr21.ads @@ -0,0 +1,5 @@ +package Discr21 is + + procedure Test; + +end Discr21; diff --git a/gcc/testsuite/gnat.dg/discr21_pkg.ads b/gcc/testsuite/gnat.dg/discr21_pkg.ads new file mode 100644 index 00000000000..d156df62517 --- /dev/null +++ b/gcc/testsuite/gnat.dg/discr21_pkg.ads @@ -0,0 +1,19 @@ +package Discr21_Pkg is + + type Position is record + x,y,z : Float; + end record; + + type Dim is (Two, Three); + + type VPosition (D: Dim := Three) is record + x, y : Float; + case D is + when Two => null; + when Three => z : Float; + end case; + end record; + + function To_Position (x, y, z : Float) return VPosition; + +end Discr21_Pkg; diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index dd3f6807b83..86246688680 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -1243,7 +1243,10 @@ build_ref_for_offset_1 (tree *res, tree type, HOST_WIDE_INT offset, pos = int_bit_position (fld); gcc_assert (TREE_CODE (type) == RECORD_TYPE || pos == 0); - size = tree_low_cst (DECL_SIZE (fld), 1); + tr_size = DECL_SIZE (fld); + if (!tr_size || !host_integerp (tr_size, 1)) + continue; + size = tree_low_cst (tr_size, 1); if (pos > offset || (pos + size) <= offset) continue;