From 1b2f07038efccdd0cf0f99d5a8701a94cc1f9033 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 11 Nov 2002 12:42:17 +0000 Subject: [PATCH] re PR c++/7788 (g++-3.2 internal error: Segmentation fault) cp: PR c++/7788 * rtti.c (unemitted_tinfo_decl_p): Check it has a field. testsuite: PR c++/7788 * g++.dg/rtti/crash1.C: New test. From-SVN: r59021 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/rtti.c | 8 +++++--- gcc/testsuite/ChangeLog | 5 +++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6f7126138b33..c492428cf6e0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2002-11-11 Nathan Sidwell + + PR c++/7788 + * rtti.c (unemitted_tinfo_decl_p): Check it has a field. + 2002-11-02 Zack Weinberg PR c/7353 redux diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index ae23234ee66b..39cb1c680545 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -1413,11 +1413,13 @@ unemitted_tinfo_decl_p (t, data) TREE_CODE (t) == VAR_DECL /* whos name points back to itself */ && IDENTIFIER_GLOBAL_VALUE (DECL_NAME (t)) == t - /* whos name's type is non-null */ + /* whose name's type is non-null */ && TREE_TYPE (DECL_NAME (t)) - /* and whos type is a struct */ + /* and whose type is a struct */ && TREE_CODE (TREE_TYPE (t)) == RECORD_TYPE - /* with a first field of our pseudo type info */ + /* with a field */ + && TYPE_FIELDS (TREE_TYPE (t)) + /* which is our pseudo type info */ && TREE_TYPE (TYPE_FIELDS (TREE_TYPE (t))) == ti_desc_type_node) return 1; return 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 977fad8ffd0c..30d0750b86ce 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2002-11-11 Nathan Sidwell + + PR c++/7788 + * g++.dg/rtti/crash1.C: New test. + 2002-11-07 Hans-Peter Nilsson * gcc.dg/wint_t-1.c, gcc.dg/wchar_t-1.c: Remove excess-errors -- 2.47.2