diff options
| author | Andreas Tobler <a.tobler@schweiz.org> | 2008-03-21 20:49:25 +0000 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2008-03-21 21:49:25 +0100 |
| commit | f03f16b2b3e23cc54aa689c786037123ac8c9094 (patch) | |
| tree | 6c22c80b546b235cfa3846f93671a80b39d8bae1 /gcc | |
| parent | 7fb1431bfa30ac9d85fb614f786c8076ff407673 (diff) | |
| download | gcc-f03f16b2b3e23cc54aa689c786037123ac8c9094.zip gcc-f03f16b2b3e23cc54aa689c786037123ac8c9094.tar.gz gcc-f03f16b2b3e23cc54aa689c786037123ac8c9094.tar.bz2 | |
re PR bootstrap/35660 (Bootstrap failure on i686-apple-darwin9 at revision 133434.)
2008-03-21 Andreas Tobler <a.tobler@schweiz.org>
PR bootstrap/35660
* objc-act.c (objc_generate_cxx_ctor_or_dtor): Rename IS_AGGR_TYPE to
MAYBE_CLASS_TYPE_P.
(objc_generate_cxx_cdtors): Likewise.
(add_instance_variable): Likewise.
From-SVN: r133436
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/objc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 6a1fc56..b71a4d1 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,11 @@ +2008-03-21 Andreas Tobler <a.tobler@schweiz.org> + + PR bootstrap/35660 + * objc-act.c (objc_generate_cxx_ctor_or_dtor): Rename IS_AGGR_TYPE to + MAYBE_CLASS_TYPE_P. + (objc_generate_cxx_cdtors): Likewise. + (add_instance_variable): Likewise. + 2008-02-26 Tom Tromey <tromey@redhat.com> * objc-act.c (objc_init): Remove old location code. diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index c8b418c..576e569 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -4482,7 +4482,7 @@ objc_generate_cxx_ctor_or_dtor (bool dtor) /* Call the ivar's default constructor or destructor. Do not call the destructor unless a corresponding constructor call has also been made (or is not needed). */ - if (IS_AGGR_TYPE (type) + if (MAYBE_CLASS_TYPE_P (type) && (dtor ? (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (type) && (!TYPE_NEEDS_CONSTRUCTING (type) @@ -4535,7 +4535,7 @@ objc_generate_cxx_cdtors (void) { tree type = TREE_TYPE (ivar); - if (IS_AGGR_TYPE (type)) + if (MAYBE_CLASS_TYPE_P (type)) { if (TYPE_NEEDS_CONSTRUCTING (type) && TYPE_HAS_DEFAULT_CONSTRUCTOR (type)) @@ -7056,7 +7056,7 @@ add_instance_variable (tree class, int public, tree field_decl) need to either (1) warn the user about it or (2) generate suitable constructor/destructor call from '- .cxx_construct' or '- .cxx_destruct' methods (if '-fobjc-call-cxx-cdtors' was specified). */ - if (IS_AGGR_TYPE (field_type) + if (MAYBE_CLASS_TYPE_P (field_type) && (TYPE_NEEDS_CONSTRUCTING (field_type) || TYPE_HAS_NONTRIVIAL_DESTRUCTOR (field_type) || TYPE_POLYMORPHIC_P (field_type))) |