From: Tom Tromey <tom@tromey.com>
Date: Wed, 25 Nov 2020 17:19:40 +0000 (-0700)
Subject: Remove two unnecessary variables from evaluate_subexp_standard
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cbfa382abb360307c0c6b750e4c550a0d2b702d6;p=binutils-gdb.git

Remove two unnecessary variables from evaluate_subexp_standard

I noticed a couple of spots in evaluate_subexp_standard that looked
like:

    value *result;
    result = something;
    return result;

This patch simplifies these spots to a simple "return".

gdb/ChangeLog
2020-11-25  Tom Tromey  <tom@tromey.com>

	* eval.c (evaluate_subexp_standard): Remove unnecessary
	variables.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 77aeb77e0d7..0379a4c2f92 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-25  Tom Tromey  <tom@tromey.com>
+
+	* eval.c (evaluate_subexp_standard): Remove unnecessary
+	variables.
+
 2020-11-25  Tom Tromey  <tom@tromey.com>
 
 	* d-lang.c: Include parser-defs.h.
diff --git a/gdb/eval.c b/gdb/eval.c
index 2626ee6d876..407d4b4ac59 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -2142,12 +2142,11 @@ evaluate_subexp_standard (struct type *expect_type,
 		  || op == BINOP_MOD)
 	      && value_logical_not (arg2))
 	    {
-	      struct value *v_one, *retval;
+	      struct value *v_one;
 
 	      v_one = value_one (value_type (arg2));
 	      binop_promote (exp->language_defn, exp->gdbarch, &arg1, &v_one);
-	      retval = value_binop (arg1, v_one, op);
-	      return retval;
+	      return value_binop (arg1, v_one, op);
 	    }
 	  else
 	    {
@@ -2532,12 +2531,7 @@ evaluate_subexp_standard (struct type *expect_type,
 	  return eval_skip_value (exp);
 	}
       else
-	{
-	  struct value *retvalp = evaluate_subexp_for_address (exp, pos,
-							       noside);
-
-	  return retvalp;
-	}
+	return evaluate_subexp_for_address (exp, pos, noside);
 
     case UNOP_SIZEOF:
       if (noside == EVAL_SKIP)