diff options
| author | Doug Evans <dje@google.com> | 2010-06-27 16:40:14 +0000 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2010-06-27 16:40:14 +0000 |
| commit | 1596cb5d604ef0aae6d6a655e568816804c5582d (patch) | |
| tree | 8b33c642aed726c8389dece603e71493d6627b99 | |
| parent | 9f18a3b3988f37aaa2b90305f1fd1a359f2ae685 (diff) | |
| download | gdb-1596cb5d604ef0aae6d6a655e568816804c5582d.zip gdb-1596cb5d604ef0aae6d6a655e568816804c5582d.tar.gz gdb-1596cb5d604ef0aae6d6a655e568816804c5582d.tar.bz2 | |
* value.c (value_static_field): Use `switch' instead of `if'.
Assert-fail if passed invalid TYPE_FIELD_LOC_KIND.
| -rw-r--r-- | gdb/ChangeLog | 3 | ||||
| -rw-r--r-- | gdb/value.c | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2fb33bb..6e700a4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2010-06-27 Doug Evans <dje@google.com> + * value.c (value_static_field): Use `switch' instead of `if'. + Assert-fail if passed invalid TYPE_FIELD_LOC_KIND. + * valops.c (search_struct_field): Fix typo in error message. 2010-06-26 Ulrich Weigand <uweigand@de.ibm.com> diff --git a/gdb/value.c b/gdb/value.c index 5e0e8d8..1c0bc57 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1850,7 +1850,7 @@ unpack_pointer (struct type *type, const gdb_byte *valaddr) } -/* Get the value of the FIELDN'th field (which must be static) of +/* Get the value of the FIELDNO'th field (which must be static) of TYPE. Return NULL if the field doesn't exist or has been optimized out. */ @@ -1859,12 +1859,13 @@ value_static_field (struct type *type, int fieldno) { struct value *retval; - if (TYPE_FIELD_LOC_KIND (type, fieldno) == FIELD_LOC_KIND_PHYSADDR) + switch (TYPE_FIELD_LOC_KIND (type, fieldno)) { + case FIELD_LOC_KIND_PHYSADDR: retval = value_at_lazy (TYPE_FIELD_TYPE (type, fieldno), TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)); - } - else + break; + case FIELD_LOC_KIND_PHYSNAME: { char *phys_name = TYPE_FIELD_STATIC_PHYSNAME (type, fieldno); /*TYPE_FIELD_NAME (type, fieldno);*/ @@ -1897,7 +1898,12 @@ value_static_field (struct type *type, int fieldno) if (retval && VALUE_LVAL (retval) == lval_memory) SET_FIELD_PHYSADDR (TYPE_FIELD (type, fieldno), value_address (retval)); + break; } + default: + gdb_assert (0); + } + return retval; } |