diff options
| -rw-r--r-- | gdb/ChangeLog | 3 | ||||
| -rw-r--r-- | gdb/python/py-prettyprint.c | 21 |
2 files changed, 12 insertions, 12 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6531dc2..ddb917e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2011-03-01 Michael Snyder <msnyder@vmware.com> + * python/py-prettyprint.c (apply_val_pretty_printer): Remove + superfluous null check. + * std-regs.c (value_of_builtin_frame_pc_reg): Frame can't be null. (value_of_builtin_frame_fp_reg): Ditto. diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index 7276486..89c832a 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -692,8 +692,7 @@ apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr, enum string_repr_result print_result; /* No pretty-printer support for unavailable values. */ - if (val && !value_bytes_available (val, embedded_offset, - TYPE_LENGTH (type))) + if (!value_bytes_available (val, embedded_offset, TYPE_LENGTH (type))) return 0; cleanups = ensure_python_env (gdbarch, language); @@ -703,16 +702,14 @@ apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr, valaddr += embedded_offset; value = value_from_contents_and_address (type, valaddr, address + embedded_offset); - if (val != NULL) - { - set_value_component_location (value, val); - /* set_value_component_location resets the address, so we may - need to set it again. */ - if (VALUE_LVAL (value) != lval_internalvar - && VALUE_LVAL (value) != lval_internalvar_component - && VALUE_LVAL (value) != lval_computed) - set_value_address (value, address + embedded_offset); - } + + set_value_component_location (value, val); + /* set_value_component_location resets the address, so we may + need to set it again. */ + if (VALUE_LVAL (value) != lval_internalvar + && VALUE_LVAL (value) != lval_internalvar_component + && VALUE_LVAL (value) != lval_computed) + set_value_address (value, address + embedded_offset); val_obj = value_to_value_object (value); if (! val_obj) |