From cd36c83e9bb1c8cf66082da63234925482695ef1 Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Tue, 10 May 2016 15:57:37 +0000 Subject: [PATCH] DWARF: fix stack usage assessment for DW_OP_neg When the DWARF back-end generates DW_OP_neg operations in DWARF procedures, we get an ICE because of inconsistent stack usage computation for the embedding expression. This is because resolve_args_picking_1 thinks DW_OP_neg is a binary operation (pops 2 stack slots, pushes 1) whereas it really is an unary one (one pop, one push). This change fixes resolve_args_picking_1 and adds a regression testcase (which crashes with the current trunk). Bootstrapped and regtested without regression on x86_64-linux. gcc/ * dwarf2out.c (resolve_args_picking_1): Consider DW_OP_neg as an unary operation, not a binary one. gcc/testsuite/ * gnat.dg/debug6.adb, gnat.dg/debug6_pkg.ads: New testcase. From-SVN: r236087 --- gcc/ChangeLog | 5 +++++ gcc/dwarf2out.c | 2 +- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/debug6.adb | 10 ++++++++++ gcc/testsuite/gnat.dg/debug6_pkg.ads | 16 ++++++++++++++++ 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gnat.dg/debug6.adb create mode 100644 gcc/testsuite/gnat.dg/debug6_pkg.ads diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e43a062ce9d..941748c10eb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-05-10 Pierre-Marie de Rodat + + * dwarf2out.c (resolve_args_picking_1): Consider DW_OP_neg as an + unary operation, not a binary one. + 2016-05-10 Ilya Enkovich PR tree-optimization/70786 diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index da95e19849d..8f192e877d7 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -15407,6 +15407,7 @@ resolve_args_picking_1 (dw_loc_descr_ref loc, unsigned initial_frame_offset, case DW_OP_swap: case DW_OP_rot: case DW_OP_abs: + case DW_OP_neg: case DW_OP_not: case DW_OP_plus_uconst: case DW_OP_skip: @@ -15543,7 +15544,6 @@ resolve_args_picking_1 (dw_loc_descr_ref loc, unsigned initial_frame_offset, case DW_OP_minus: case DW_OP_mod: case DW_OP_mul: - case DW_OP_neg: case DW_OP_or: case DW_OP_plus: case DW_OP_shl: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7cf507f51f6..1e42f38989c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2016-05-10 Pierre-Marie de Rodat + + * gnat.dg/debug6.adb, gnat.dg/debug6_pkg.ads: New testcase. + 2016-05-10 Ilya Enkovich PR tree-optimization/70786 diff --git a/gcc/testsuite/gnat.dg/debug6.adb b/gcc/testsuite/gnat.dg/debug6.adb new file mode 100644 index 00000000000..25fdef206df --- /dev/null +++ b/gcc/testsuite/gnat.dg/debug6.adb @@ -0,0 +1,10 @@ +-- { dg-do compile } +-- { dg-options "-g" } + +with Debug6_Pkg; use Debug6_Pkg; + +procedure Debug6 is + V : Value := (Kind => Undefined); +begin + Process (V); +end Debug6; diff --git a/gcc/testsuite/gnat.dg/debug6_pkg.ads b/gcc/testsuite/gnat.dg/debug6_pkg.ads new file mode 100644 index 00000000000..dfc9744079b --- /dev/null +++ b/gcc/testsuite/gnat.dg/debug6_pkg.ads @@ -0,0 +1,16 @@ +package Debug6_Pkg is + + type Vkind is (Int, Undefined); + for Vkind use (Int => -2 ** 31, Undefined => 0); + + type Value (Kind : Vkind) is record + case Kind is + when Undefined => null; + when Int => Value : Integer; + when others => null; + end case; + end record; + + procedure Process (V : Value); + +end Debug6_Pkg; -- 2.30.2