From da5c522f5be478d020c14038ace2ba2ee2b9e032 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 14 Aug 2014 13:36:24 -0700 Subject: [PATCH] avoid "if ... else if ... else" logic in ada-lang.c::ada_evaluate_subexp The OP_VAR_VALUE branch in ada_evaluate_subexp is written with multiple "if ... else if ... else if ... else ..." block. But in practice, these blocks all either goto out of that block of code, or return. This patch rewrites this code slightly by replacing the "else if"-s by simple "if"s. This should better reflect the ideal processing where we try to do a standard eval whenever possible, and only do something else when the standard eval does not work. On a pratical level, this patch makes it easier to fall through to the default processing when none of the special situations are detected, thus making it easier to add more handlers of those special situations; or to remove them as they no longer become necessary! gdb/ChangeLog: * ada-lang.c (ada_evaluate_subexp) : Slight code rewrite to avoid "else if" and "else" constructs. Should be a no-op in practice. --- gdb/ChangeLog | 6 ++++++ gdb/ada-lang.c | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8cb2f18c7a2..23bc2149728 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-08-18 Joel Brobecker + + * ada-lang.c (ada_evaluate_subexp) : Slight code + rewrite to avoid "else if" and "else" constructs. Should be + a no-op in practice. + 2014-08-18 Joel Brobecker * ada-lang.c (ada_evaluate_subexp) : Fix identation diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 334df1f8be8..a9b5e6f2f80 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10121,13 +10121,15 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, *pos += 4; goto nosideret; } - else if (SYMBOL_DOMAIN (exp->elts[pc + 2].symbol) == UNDEF_DOMAIN) + + if (SYMBOL_DOMAIN (exp->elts[pc + 2].symbol) == UNDEF_DOMAIN) /* Only encountered when an unresolved symbol occurs in a context other than a function call, in which case, it is invalid. */ error (_("Unexpected unresolved symbol, %s, during evaluation"), SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol)); - else if (noside == EVAL_AVOID_SIDE_EFFECTS) + + if (noside == EVAL_AVOID_SIDE_EFFECTS) { type = static_unwrap_type (SYMBOL_TYPE (exp->elts[pc + 2].symbol)); /* Check to see if this is a tagged type. We also need to handle @@ -10186,11 +10188,9 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, *pos += 4; return value_zero (to_static_fixed_type (type), not_lval); } - else - { - arg1 = evaluate_subexp_standard (expect_type, exp, pos, noside); - return ada_to_fixed_value (arg1); - } + + arg1 = evaluate_subexp_standard (expect_type, exp, pos, noside); + return ada_to_fixed_value (arg1); case OP_FUNCALL: (*pos) += 2; -- 2.30.2