aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/eval.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/gdb/eval.c b/gdb/eval.c
index 914a552..7b18723 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1666,10 +1666,6 @@ evaluate_subexp_standard (struct type *expect_type,
offset_item =
array_size_array[i] * offset_item + subscript_array[i];
- /* Construct a value node with the value of the offset */
-
- arg2 = value_from_longest (builtin_type_f_integer, offset_item);
-
/* Let us now play a dirty trick: we will take arg1
which is a value node pointing to the topmost level
of the multidimensional array-set and pretend
@@ -1678,7 +1674,15 @@ evaluate_subexp_standard (struct type *expect_type,
returns the correct type value */
VALUE_TYPE (arg1) = tmp_type;
- return value_ind (value_add (value_coerce_array (arg1), arg2));
+
+ f77_get_dynamic_lowerbound (tmp_type, &lower);
+
+ /* Construct a value node with the value of the offset */
+ /* lower will get subtracted off in value_subscript, hence add it here */
+
+ arg2 = value_from_longest (builtin_type_f_integer, offset_item + lower);
+
+ return value_subscript(arg1, arg2);
}
case BINOP_LOGICAL_AND: