diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2858398433..2f0e8ddba3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-04  Pedro Alves  <palves@redhat.com>
+
+	* eval.c (evaluate_subexp_standard) <UNOP_COMPLEMENT, UNOP_ADDR>:
+	Remove useless assignments to 'op'.
+
 2017-09-04  Pedro Alves  <palves@redhat.com>
 
 	* eval.c (eval_skip_value): New function.
diff --git a/gdb/eval.c b/gdb/eval.c
index 639e06e292..cb41a4a03e 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -2493,7 +2493,6 @@ evaluate_subexp_standard (struct type *expect_type,
 
     case UNOP_COMPLEMENT:
       /* C++: check for and handle destructor names.  */
-      op = exp->elts[*pos].opcode;
 
       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
       if (noside == EVAL_SKIP)
@@ -2561,8 +2560,6 @@ evaluate_subexp_standard (struct type *expect_type,
     case UNOP_ADDR:
       /* C++: check for and handle pointer to members.  */
 
-      op = exp->elts[*pos].opcode;
-
       if (noside == EVAL_SKIP)
 	{
 	  evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP);