From 6f3d0447fe81bbea10203da40b4bf2bf48a213cd Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 10 Apr 2002 18:06:33 -0700 Subject: [PATCH] except.c (add_ehl_entry): Allow duplicates after landing pad creation. * except.c (add_ehl_entry): Allow duplicates after landing pad creation. From-SVN: r52149 --- gcc/ChangeLog | 5 +++++ gcc/except.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 095c88a98b7..482ef8d2a08 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2002-04-10 Richard Henderson + + * except.c (add_ehl_entry): Allow duplicates after landing pad + creation. + 2002-04-10 David Edelsohn * config/rs6000/t-aix43 (SHLIB_NM_FLAGS): Add -X32_64. diff --git a/gcc/except.c b/gcc/except.c index d4a903e597c..e79d23269fe 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -1383,8 +1383,14 @@ add_ehl_entry (label, region) slot = (struct ehl_map_entry **) htab_find_slot (exception_handler_label_map, entry, INSERT); - if (*slot) + + /* Before landing pad creation, each exception handler has its own + label. After landing pad creation, the exception handlers may + share landing pads. This is ok, since maybe_remove_eh_handler + only requires the 1-1 mapping before landing pad creation. */ + if (*slot && !cfun->eh->built_landing_pads) abort (); + *slot = entry; } -- 2.30.2