* eval.c (evaluate_subexp_standard): Revert inadvertent change.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0a3b67926cfe4c3827eeaab66e281f0feff92998..da1da920e2168f10febc8f0227e88ca3342f4771 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-11  Tom Tromey  <tromey@redhat.com>
+
+       * eval.c (evaluate_subexp_standard): Revert inadvertent change.
+
 2010-05-10  Michael Snyder  <msnyder@vmware.com>
 
        * utils.c: White space cleanup.

diff --git a/gdb/eval.c b/gdb/eval.c
index 2c8b01f4d81c7d1ed176d411adea15d2ccbf3f87..273cd0e145d86d819beeca2f0aa4b129c4d2722c 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -2033,8 +2033,8 @@ evaluate_subexp_standard (struct type *expect_type,
       error (_("':' operator used in invalid context"));
 
     case BINOP_SUBSCRIPT:
-      arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
-      arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+      arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
+      arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
       if (noside == EVAL_SKIP)
        goto nosideret;
       if (binop_user_defined_p (op, arg1, arg2))