diff options
| author | Andrew Pinski <pinskia@gcc.gnu.org> | 2006-09-26 08:36:21 -0700 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2006-09-26 08:36:21 -0700 |
| commit | e91de072adbe07ae528857a75c9ef4f1d12e5688 (patch) | |
| tree | c375a10a62d82187241f5638ddcb0c9b2d0368cf /gcc/objc | |
| parent | 32d662aa80bd3c9a6daa74a4e34757da900657fd (diff) | |
| download | gcc-e91de072adbe07ae528857a75c9ef4f1d12e5688.zip gcc-e91de072adbe07ae528857a75c9ef4f1d12e5688.tar.gz gcc-e91de072adbe07ae528857a75c9ef4f1d12e5688.tar.bz2 | |
re PR objc/29195 (ICE in expand_expr_real_1, at expr.c:6932)
2006-09-26 Andrew Pinski <pinskia@physics.uc.edu>
PR objc/29195
* objc-act.c (objc_push_parm): If we change the type of the
decl, relayout the decl.
2006-09-26 Andrew Pinski <pinskia@physics.uc.edu>
PR objc/29195
* objc/compile/method-1.m: New test.
From-SVN: r117229
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 15 |
2 files changed, 19 insertions, 2 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index ec777a6..df8a587 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,9 @@ +2006-09-26 Andrew Pinski <pinskia@physics.uc.edu> + + PR objc/29195 + * objc-act.c (objc_push_parm): If we change the type of the + decl, relayout the decl. + 2006-09-19 Eric Christopher <echristo@apple.com> * objc-act.c (JBLEN): Rename to OBJC_JBLEN, diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 7ac785f..1d3513b 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -8223,11 +8223,22 @@ static GTY(()) tree objc_parmlist = NULL_TREE; static void objc_push_parm (tree parm) { + bool relayout_needed = false; /* Decay arrays and functions into pointers. */ if (TREE_CODE (TREE_TYPE (parm)) == ARRAY_TYPE) - TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (TREE_TYPE (parm))); + { + TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (TREE_TYPE (parm))); + relayout_needed = true; + } else if (TREE_CODE (TREE_TYPE (parm)) == FUNCTION_TYPE) - TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (parm)); + { + TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (parm)); + relayout_needed = true; + } + + if (relayout_needed) + relayout_decl (parm); + DECL_ARG_TYPE (parm) = lang_hooks.types.type_promotes_to (TREE_TYPE (parm)); |