From 1ff247496641c78fbfbeb6a04db2c8dbdedbcf1f Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sun, 17 Jul 2011 15:06:36 +0000 Subject: [PATCH] re PR middle-end/49732 (crash on terminal_interface-curses-menus.adb from ncurses with -gnato) PR middle-end/49732 * tree.c (walk_tree_1) : Do not walk a pointed-to type. From-SVN: r176371 --- gcc/ChangeLog | 5 ++++ gcc/testsuite/ChangeLog | 4 +++ gcc/testsuite/gnat.dg/pointer_controlled.adb | 31 ++++++++++++++++++++ gcc/tree.c | 11 +++++-- 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/pointer_controlled.adb diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8608327d0e8..84e9ad508f0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-07-17 Eric Botcazou + + PR middle-end/49732 + * tree.c (walk_tree_1) : Do not walk a pointed-to type. + 2011-07-16 Matthias Klose * doc/install.texi: Document --enable-static-libjava. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6abed53c2aa..2e5683c623a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-07-17 Eric Botcazou + + * gnat.dg/pointer_controlled.adb: New test. + 2011-07-17 Tobias Burnus PR fortran/49624 diff --git a/gcc/testsuite/gnat.dg/pointer_controlled.adb b/gcc/testsuite/gnat.dg/pointer_controlled.adb new file mode 100644 index 00000000000..1d85b53fec3 --- /dev/null +++ b/gcc/testsuite/gnat.dg/pointer_controlled.adb @@ -0,0 +1,31 @@ +-- PR ada/49732 +-- Testcase by Vorfeed Canal + +-- { dg-do compile } +-- { dg-options "-gnato" } + +with Interfaces.C; use Interfaces.C; +with Interfaces.C.Strings; use Interfaces.C.Strings; +with Interfaces.C.Pointers; + +procedure Pointer_Controlled is + + function Create (Name : String) return size_t is + + type Name_String is new char_array (0 .. Name'Length); + type Name_String_Ptr is access Name_String; + pragma Controlled (Name_String_Ptr); + + Name_Str : constant Name_String_Ptr := new Name_String; + Name_Len : size_t; + + begin + To_C (Name, Name_Str.all, Name_Len); + return 1; + end; + + Test : size_t; + +begin + Test := Create("ABC"); +end; diff --git a/gcc/tree.c b/gcc/tree.c index acc3841f216..10f50de8a52 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -10596,9 +10596,14 @@ walk_tree_1 (tree *tp, walk_tree_fn func, void *data, if (result || !walk_subtrees) return result; - result = walk_type_fields (*type_p, func, data, pset, lh); - if (result) - return result; + /* But do not walk a pointed-to type since it may itself need to + be walked in the declaration case if it isn't anonymous. */ + if (!POINTER_TYPE_P (*type_p)) + { + result = walk_type_fields (*type_p, func, data, pset, lh); + if (result) + return result; + } /* If this is a record type, also walk the fields. */ if (RECORD_OR_UNION_TYPE_P (*type_p)) -- 2.30.2