diff options
author | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-07-17 12:16:59 +0200 |
---|---|---|
committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-07-17 12:16:59 +0200 |
commit | 24cb156d237c740c4e68ac5399efda6bae00482b (patch) | |
tree | bb226c2fdd284b0e5fdb8ba483fd2147154cd2c6 /gcc/ada/raise-gcc.c | |
parent | 79ee6ab38bffb7e0c3f1a1e3b41cc9216ecd0d56 (diff) | |
download | gcc-24cb156d237c740c4e68ac5399efda6bae00482b.zip gcc-24cb156d237c740c4e68ac5399efda6bae00482b.tar.gz gcc-24cb156d237c740c4e68ac5399efda6bae00482b.tar.bz2 |
[multiple changes]
2012-07-17 Vincent Pucci <pucci@adacore.com>
* gnat_ugn.texi: GNAT dimensionality checking
documentation updated with System.Dim.Mks modifications.
2012-07-17 Ed Schonberg <schonberg@adacore.com>
* exp_ch3.adb: sloc of array init_proc is sloc of type declaration.
2012-07-17 Tristan Gingold <gingold@adacore.com>
* raise-gcc.c (get_call_site_action_for): Remove useless init
expression for p.
(get_action_description_for): Do not overwrite action->kind.
2012-07-17 Hristian Kirtchev <kirtchev@adacore.com>
* exp_attr.adb (Expand_N_Attribute_Reference): Add local variables Attr
and Conversion_Added. Add local constant Typ.
Retrieve the original attribute after the arithmetic check
machinery has modified the node. Add a conversion to the target
type when the prefix of attribute Max_Size_In_Storage_Elements
is a controlled type.
2012-07-17 Gary Dismukes <dismukes@adacore.com>
* exp_ch6.adb (Expand_Inlined_Call): For each actual parameter
of mode 'out' or 'in out' that denotes an entity, reset
Last_Assignment on the entity so that any assignments to the
corresponding formal in the inlining will not trigger spurious
warnings about overwriting assignments.
From-SVN: r189570
Diffstat (limited to 'gcc/ada/raise-gcc.c')
-rw-r--r-- | gcc/ada/raise-gcc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ada/raise-gcc.c b/gcc/ada/raise-gcc.c index 418e080..4da4bd2 100644 --- a/gcc/ada/raise-gcc.c +++ b/gcc/ada/raise-gcc.c @@ -710,7 +710,7 @@ get_call_site_action_for (_Unwind_Ptr call_site, else { _uleb128_t cs_lp, cs_action; - const unsigned char *p = region->call_site_table; + const unsigned char *p; /* Let the caller know there may be an action to take, but let it determine the kind. */ @@ -947,13 +947,16 @@ get_action_description_for (_Unwind_Ptr ip, passed (to follow the ABI). */ if (!(uw_phase & _UA_FORCE_UNWIND)) { + enum action_kind act; + /* See if the filter we have is for an exception which matches the one we are propagating. */ _Unwind_Ptr choice = get_ttype_entry_for (region, ar_filter); - action->kind = is_handled_by (choice, gnat_exception); - if (action->kind != nothing) + act = is_handled_by (choice, gnat_exception); + if (act != nothing) { + action->kind = act; action->ttype_filter = ar_filter; return; } |