diff options
| author | Bob Duff <duff@adacore.com> | 2021-08-11 07:44:31 -0400 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-10-05 08:20:08 +0000 |
| commit | 650ad524d8a5928998037c1f6434054d46a400d4 (patch) | |
| tree | af5a5efd2a07c00d4633db7c728060d17c18383d /gcc/ada/gcc-interface/trans.c | |
| parent | 07ad659daf4b015eb6957a7c7e299a04a0039e82 (diff) | |
| download | gcc-650ad524d8a5928998037c1f6434054d46a400d4.zip gcc-650ad524d8a5928998037c1f6434054d46a400d4.tar.gz gcc-650ad524d8a5928998037c1f6434054d46a400d4.tar.bz2 | |
[Ada] Fix latent bug in set_end_locus_from_node
gcc/ada/
* gcc-interface/trans.c (set_end_locus_from_node): Check that
Handled_Statement_Sequence is not Empty before calling
End_Label, because the Empty node has no End_Label, and
depending on the exact node layout chosen by gen_il, calling
End_Label might crash, or might work OK by accident.
Diffstat (limited to 'gcc/ada/gcc-interface/trans.c')
| -rw-r--r-- | gcc/ada/gcc-interface/trans.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 158bfe3..4aaa567 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -10507,10 +10507,15 @@ set_end_locus_from_node (tree gnu_node, Node_Id gnat_node) case N_Package_Body: case N_Subprogram_Body: case N_Block_Statement: - gnat_end_label = End_Label (Handled_Statement_Sequence (gnat_node)); + if (Present (Handled_Statement_Sequence (gnat_node))) + gnat_end_label = End_Label (Handled_Statement_Sequence (gnat_node)); + else + gnat_end_label = Empty; + break; case N_Package_Declaration: + gcc_checking_assert (Present (Specification (gnat_node))); gnat_end_label = End_Label (Specification (gnat_node)); break; |