forked from Imagelibrary/binutils-gdb
Revert the entire VLA series.
This reverts the following patch series, as they cause some regresssions. commit37c1ab67a3type: add c99 variable length array support gdb/ * dwarf2loc.c (dwarf2_locexpr_baton_eval): New function. (dwarf2_evaluate_property): New function. * dwarf2loc.h (dwarf2_evaluate_property): New function prototype. * dwarf2read.c (attr_to_dynamic_prop): New function. (read_subrange_type): Use attr_to_dynamic_prop to read high bound attribute. * gdbtypes.c: Include dwarf2loc.h. (is_dynamic_type): New function. (resolve_dynamic_type): New function. (resolve_dynamic_bounds): New function. (get_type_length): New function. (check_typedef): Use get_type_length to compute type length. * gdbtypes.h (TYPE_HIGH_BOUND_KIND): New macro. (TYPE_LOW_BOUND_KIND): New macro. (is_dynamic_type): New function prototype. * value.c (value_from_contents_and_address): Call resolve_dynamic_type to resolve dynamic properties of the type. Update comment. * valops.c (get_value_at, value_at, value_at_lazy): Update comment. commit26cb189f8bvla: enable sizeof operator to work with variable length arrays gdb/ * eval.c (evaluate_subexp_for_sizeof) <OP_VAR_VALUE>: If the type passed to sizeof is dynamic evaluate the argument to compute the length. commit04b19544efvla: enable sizeof operator for indirection gdb/ * eval.c (evaluate_subexp_for_sizeof) <UNOP_IND>: Create an indirect value and retrieve the dynamic type size. commitbcd629a44fvla: update type from newly created value gdb/ * ada-lang.c (ada_value_primitive_packed_val): Re-fetch type from value. (ada_template_to_fixed_record_type_1): Likewise. (ada_to_fixed_type_1): Likewise. * cp-valprint.c (cp_print_value_fields_rtti): Likewise. (cp_print_value): Likewise. * d-valprint.c (dynamic_array_type): Likewise. * eval.c (evaluate_subexp_with_coercion): Likewise. * findvar.c (address_of_variable): Likewise. * jv-valprint.c (java_value_print): Likewise. * valops.c (value_ind): Likewise. * value.c (coerce_ref): Likewise. commitb86138fb04vla: print "variable length" for unresolved dynamic bounds gdb/ * c-typeprint.c (c_type_print_varspec_suffix): Added check for not yet resolved high bound. If unresolved, print "variable length" string to the console instead of random length. commite1969afbd4vla: support for DW_AT_count gdb/ * dwarf2read.c (read_subrange_type): Convert DW_AT_count to a dynamic property and store it as the high bound and flag the range accordingly. * gdbtypes.c (resolve_dynamic_bounds): If range is flagged as RANGE_UPPER_BOUND_IS_COUNT assign low + high - 1 as the new high bound. * gdbtypes.h (enum range_flags): New enum. (struct range_bounds): Add flags member. commit92b09522dcvla: resolve dynamic bounds if value contents is a constant byte-sequence gdb/ * findvar.c (default_read_var_value): Resolve dynamic bounds if location points to a constant blob. commit3bce82377fvla: evaluate operand of sizeof if its type is a vla gdb/ * eval.c (evaluate_subexp_for_sizeof): Add enum noside argument. (evaluate_subexp_standard): Pass noside argument. (evaluate_subexp_for_sizeof) <BINOP_SUBSCRIPT>: Handle subscript case if noside equals EVAL_NORMAL. If the subscript yields a vla type re-evaluate subscript operation with EVAL_NORMAL to enable sideffects. * gdbtypes.c (resolve_dynamic_bounds): Mark bound as evaluated. * gdbtypes.h (enum range_flags): Add RANGE_EVALUATED case. gdb/testsuite * gdb.base/vla-sideeffect.c: New file. * gdb.base/vla-sideeffect.exp: New file. commit504f34326etest: cover subranges with present DW_AT_count attribute gdb/testsuite/ * gdb.dwarf2/count.exp: New file. commit1a237e0ee5test: multi-dimensional c99 vla. gdb/testsuite/ * gdb.base/vla-multi.c: New file. * gdb.base/vla-multi.exp: New file. commit024e13b46ftest: evaluate pointers to C99 vla correctly. gdb/testsuite/ * gdb.base/vla-ptr.c: New file. * gdb.base/vla-ptr.exp: New file. commitc8655f75e2test: basic c99 vla tests for C primitives gdb/testsuite/ * gdb.base/vla-datatypes.c: New file. * gdb.base/vla-datatypes.exp: New file. commit58a84dcf29test: add mi vla test gdb/testsuite/ * gdb.mi/mi-vla-c99.exp: New file. * gdb.mi/vla.c: New file.
This commit is contained in:
19
gdb/valops.c
19
gdb/valops.c
@@ -266,7 +266,6 @@ value_cast_structs (struct type *type, struct value *v2)
|
||||
{
|
||||
v = value_full_object (v2, real_type, full, top, using_enc);
|
||||
v = value_at_lazy (real_type, value_address (v));
|
||||
real_type = value_type (v);
|
||||
|
||||
/* We might be trying to cast to the outermost enclosing
|
||||
type, in which case search_struct_field won't work. */
|
||||
@@ -802,7 +801,6 @@ value_dynamic_cast (struct type *type, struct value *arg)
|
||||
return value_at_lazy (type, addr);
|
||||
|
||||
tem = value_at (type, addr);
|
||||
type = value_type (tem);
|
||||
|
||||
/* The first dynamic check specified in 5.2.7. */
|
||||
if (is_public_ancestor (arg_type, TYPE_TARGET_TYPE (resolved_type)))
|
||||
@@ -902,10 +900,7 @@ value_one (struct type *type)
|
||||
return val;
|
||||
}
|
||||
|
||||
/* Helper function for value_at, value_at_lazy, and value_at_lazy_stack.
|
||||
The type of the created value may differ from the passed type TYPE.
|
||||
Make sure to retrieve the returned values's new type after this call
|
||||
e.g. in case the type is a variable length array. */
|
||||
/* Helper function for value_at, value_at_lazy, and value_at_lazy_stack. */
|
||||
|
||||
static struct value *
|
||||
get_value_at (struct type *type, CORE_ADDR addr, int lazy)
|
||||
@@ -930,10 +925,7 @@ get_value_at (struct type *type, CORE_ADDR addr, int lazy)
|
||||
value_at_lazy instead. value_at_lazy simply records the address of
|
||||
the data and sets the lazy-evaluation-required flag. The lazy flag
|
||||
is tested in the value_contents macro, which is used if and when
|
||||
the contents are actually required. The type of the created value
|
||||
may differ from the passed type TYPE. Make sure to retrieve the
|
||||
returned values's new type after this call e.g. in case the type
|
||||
is a variable length array.
|
||||
the contents are actually required.
|
||||
|
||||
Note: value_at does *NOT* handle embedded offsets; perform such
|
||||
adjustments before or after calling it. */
|
||||
@@ -944,10 +936,7 @@ value_at (struct type *type, CORE_ADDR addr)
|
||||
return get_value_at (type, addr, 0);
|
||||
}
|
||||
|
||||
/* Return a lazy value with type TYPE located at ADDR (cf. value_at).
|
||||
The type of the created value may differ from the passed type TYPE.
|
||||
Make sure to retrieve the returned values's new type after this call
|
||||
e.g. in case the type is a variable length array. */
|
||||
/* Return a lazy value with type TYPE located at ADDR (cf. value_at). */
|
||||
|
||||
struct value *
|
||||
value_at_lazy (struct type *type, CORE_ADDR addr)
|
||||
@@ -1322,7 +1311,6 @@ address_of_variable (struct symbol *var, const struct block *b)
|
||||
Lazy evaluation pays off here. */
|
||||
|
||||
val = value_of_variable (var, b);
|
||||
type = value_type (val);
|
||||
|
||||
if ((VALUE_LVAL (val) == lval_memory && value_lazy (val))
|
||||
|| TYPE_CODE (type) == TYPE_CODE_FUNC)
|
||||
@@ -1571,7 +1559,6 @@ value_ind (struct value *arg1)
|
||||
(value_as_address (arg1)
|
||||
- value_pointed_to_offset (arg1)));
|
||||
|
||||
enc_type = value_type (arg2);
|
||||
return readjust_indirect_value_type (arg2, enc_type, base_type, arg1);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user