From 528653254b46ccd95d7ffbef73acbcc1242eaee6 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 18 Mar 2014 10:52:08 -0700 Subject: [PATCH] remove unnecessary second call to static_unwrap_type in ada_evaluate_subexp In ada-lang.c::ada_evaluate_subexp, case OP_VAR_VALUE, when noside is EVAL_AVOID_SIDE_EFFECTS, the first thing we do is set type as follow: type = static_unwrap_type (SYMBOL_TYPE (exp->elts[pc + 2].symbol)); Later on in the same block, we make the same call: return value_zero (to_static_fixed_type (static_unwrap_type (SYMBOL_TYPE (exp->elts[pc + 2].symbol))), not_lval); This patch removes the second call, since it should result in the same type being returned, so no point in making that call again. gdb/ChangeLog: * ada-lang.c (ada_evaluate_subexp) : Remove unnecessary second call to static_unwrap_type. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e1093cf36b5..cd43f6ee559 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-04-28 Joel Brobecker + + * ada-lang.c (ada_evaluate_subexp) : Remove + unnecessary second call to static_unwrap_type. + 2014-04-27 Hui Zhu * stack.c (print_frame_info): Call do_gdb_disassembly with diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index da304abfd2d..0acc1b527f5 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10205,10 +10205,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, } *pos += 4; - return value_zero - (to_static_fixed_type - (static_unwrap_type (SYMBOL_TYPE (exp->elts[pc + 2].symbol))), - not_lval); + return value_zero (to_static_fixed_type (type), not_lval); } else { -- 2.30.2