summaryrefslogtreecommitdiff
path: root/gcc/except.c
diff options
context:
space:
mode:
authorjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2004-01-09 20:03:58 +0000
committerjsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>2004-01-09 20:03:58 +0000
commit48b3d38531f2736ec62d5d3af89cfc1b3a10aeea (patch)
tree48c28794b46861cbc9594568abc9b07c1a04b91e /gcc/except.c
parent60ffaf4d23b6385206e6fc4cc3a44a964e88d776 (diff)
downloadgcc-48b3d38531f2736ec62d5d3af89cfc1b3a10aeea.tar.gz
PR c/11234
* c-typeck.c (build_c_cast): If pedantic, warn for conversions between function and object pointers. (digest_init): When comparing a pointer to function type to the target type, only apply TREE_TYPE once to the pointer to function type. * except.c (for_each_eh_label_1): Treat data as a pointer to a function pointer rather than casting it to a function pointer. (for_each_eh_label): Update caller. * recog.h (struct insn_data): Use a struct or union for output. * genoutput.c (output_insn_data): Update. * final.c (get_insn_template): Update. testsuite: * gcc.dg/func-ptr-conv-1.c: New test. * gcc.dg/weak/weak-6.c, gcc.dg/weak/weak-7.c: Update. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75595 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/except.c')
-rw-r--r--gcc/except.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/except.c b/gcc/except.c
index 5958eae290f..1468d3b909f 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -1,6 +1,6 @@
/* Implements exception handling.
Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
Contributed by Mike Stump <mrs@cygnus.com>.
This file is part of GCC.
@@ -2430,14 +2430,14 @@ void
for_each_eh_label (void (*callback) (rtx))
{
htab_traverse (cfun->eh->exception_handler_label_map, for_each_eh_label_1,
- (void *)callback);
+ (void *) &callback);
}
static int
for_each_eh_label_1 (void **pentry, void *data)
{
struct ehl_map_entry *entry = *(struct ehl_map_entry **)pentry;
- void (*callback) (rtx) = (void (*) (rtx)) data;
+ void (*callback) (rtx) = *(void (**) (rtx)) data;
(*callback) (entry->label);
return 1;