X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fc-valprint.c;h=98901ce5a8eb1a5f3b237d1898872542ca60c941;hb=8e069a981cbb9b33ccfbdd82ad7da5ce8b0c35b2;hp=e205705840715dfe831ea318e38039513a4943f9;hpb=b00fdb78327b18ba0d4240724647bee58ff6b71e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index e205705840..98901ce5a8 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -1,8 +1,7 @@ /* Support for printing C values for GDB, the GNU debugger. - Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + Copyright (C) 1986, 1988-1989, 1991-2001, 2003, 2005-2012 Free + Software Foundation, Inc. This file is part of GDB. @@ -32,28 +31,6 @@ #include "target.h" -/* Print function pointer with inferior address ADDRESS onto stdio - stream STREAM. */ - -static void -print_function_pointer_address (struct gdbarch *gdbarch, CORE_ADDR address, - struct ui_file *stream, int addressprint) -{ - CORE_ADDR func_addr = gdbarch_convert_from_func_ptr_addr (gdbarch, address, - ¤t_target); - - /* If the function pointer is represented by a description, print the - address of the description. */ - if (addressprint && func_addr != address) - { - fputs_filtered ("@", stream); - fputs_filtered (paddress (gdbarch, address), stream); - fputs_filtered (": ", stream); - } - print_address_demangle (gdbarch, func_addr, stream, demangle); -} - - /* A helper for c_textual_element_type. This checks the name of the typedef. This is bogus but it isn't apparent that the compiler provides us the help we may need. */ @@ -69,8 +46,8 @@ textual_name (const char *name) /* Apply a heuristic to decide whether an array of TYPE or a pointer to TYPE should be printed as a textual string. Return non-zero if it should, or zero if it should be treated as an array of integers - or pointer to integers. FORMAT is the current format letter, - or 0 if none. + or pointer to integers. FORMAT is the current format letter, or 0 + if none. We guess that "char" is a character. Explicitly signed and unsigned character types are also characters. Integer data from @@ -119,8 +96,8 @@ c_textual_element_type (struct type *type, char format) if (format == 's') { - /* Print this as a string if we can manage it. For now, no - wide character support. */ + /* Print this as a string if we can manage it. For now, no wide + character support. */ if (TYPE_CODE (true_type) == TYPE_CODE_INT && TYPE_LENGTH (true_type) == 1) return 1; @@ -139,23 +116,20 @@ c_textual_element_type (struct type *type, char format) return 0; } - -/* Print data of type TYPE located at VALADDR (within GDB), which came from - the inferior at address ADDRESS, onto stdio stream STREAM according to - OPTIONS. The data at VALADDR is in target byte order. - - If the data are a string pointer, returns the number of string characters - printed. */ +/* See val_print for a description of the various parameters of this + function; they are identical. The semantics of the return value is + also identical to val_print. */ int -c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, - CORE_ADDR address, struct ui_file *stream, int recurse, +c_val_print (struct type *type, const gdb_byte *valaddr, + int embedded_offset, CORE_ADDR address, + struct ui_file *stream, int recurse, const struct value *original_value, const struct value_print_options *options) { struct gdbarch *gdbarch = get_type_arch (type); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - unsigned int i = 0; /* Number of characters printed */ + unsigned int i = 0; /* Number of characters printed. */ unsigned len; struct type *elttype, *unresolved_elttype; struct type *unresolved_type = type; @@ -171,8 +145,13 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, elttype = check_typedef (unresolved_elttype); if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (unresolved_elttype) > 0) { + LONGEST low_bound, high_bound; + + if (!get_array_bounds (type, &low_bound, &high_bound)) + error (_("Could not determine the array high bound")); + eltlen = TYPE_LENGTH (elttype); - len = TYPE_LENGTH (type) / eltlen; + len = high_bound - low_bound + 1; if (options->prettyprint_arrays) { print_spaces_filtered (2 + 2 * recurse, stream); @@ -180,13 +159,16 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, /* Print arrays of textual chars with a string syntax, as long as the entire array is valid. */ - if (c_textual_element_type (unresolved_elttype, options->format) + if (c_textual_element_type (unresolved_elttype, + options->format) + && value_bytes_available (original_value, embedded_offset, + TYPE_LENGTH (type)) && value_bits_valid (original_value, TARGET_CHAR_BIT * embedded_offset, TARGET_CHAR_BIT * TYPE_LENGTH (type))) { - /* If requested, look for the first null char and only print - elements up to it. */ + /* If requested, look for the first null char and only + print elements up to it. */ if (options->stop_print_at_null) { unsigned int temp_len; @@ -211,31 +193,35 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, { fprintf_filtered (stream, "{"); /* If this is a virtual function table, print the 0th - entry specially, and the rest of the members normally. */ + entry specially, and the rest of the members + normally. */ if (cp_is_vtbl_ptr_type (elttype)) { i = 1; - fprintf_filtered (stream, _("%d vtable entries"), len - 1); + fprintf_filtered (stream, _("%d vtable entries"), + len - 1); } else { i = 0; } - val_print_array_elements (type, valaddr + embedded_offset, address, stream, + val_print_array_elements (type, valaddr, embedded_offset, + address, stream, recurse, original_value, options, i); fprintf_filtered (stream, "}"); } break; } - /* Array of unspecified length: treat like pointer to first elt. */ - addr = address; + /* Array of unspecified length: treat like pointer to first + elt. */ + addr = address + embedded_offset; goto print_unpacked_pointer; case TYPE_CODE_MEMBERPTR: if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); break; } cp_print_class_member (valaddr + embedded_offset, type, stream, "&"); @@ -248,15 +234,16 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, case TYPE_CODE_PTR: if (options->format && options->format != 's') { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); break; } if (options->vtblprint && cp_is_vtbl_ptr_type (type)) { /* Print the unmangled name if desired. */ /* Print vtable entry - we only get here if we ARE using - -fvtable_thunks. (Otherwise, look under TYPE_CODE_STRUCT.) */ + -fvtable_thunks. (Otherwise, look under + TYPE_CODE_STRUCT.) */ CORE_ADDR addr = extract_typed_address (valaddr + embedded_offset, type); @@ -275,7 +262,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, /* Try to print what function it points to. */ print_function_pointer_address (gdbarch, addr, stream, options->addressprint); - /* Return value is irrelevant except for string pointers. */ + /* Return value is irrelevant except for string + pointers. */ return (0); } @@ -285,16 +273,20 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, /* For a pointer to a textual type, also print the string pointed to, unless pointer is null. */ - if (c_textual_element_type (unresolved_elttype, options->format) + if (c_textual_element_type (unresolved_elttype, + options->format) && addr != 0) { - i = val_print_string (unresolved_elttype, addr, -1, stream, - options); + i = val_print_string (unresolved_elttype, NULL, + addr, -1, + stream, options); } else if (cp_is_vtbl_member (type)) { - /* print vtbl's nicely */ - CORE_ADDR vt_address = unpack_pointer (type, valaddr + embedded_offset); + /* Print vtbl's nicely. */ + CORE_ADDR vt_address = unpack_pointer (type, + valaddr + + embedded_offset); struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (vt_address); @@ -314,8 +306,9 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, int is_this_fld; if (msymbol != NULL) - wsym = lookup_symbol (SYMBOL_LINKAGE_NAME (msymbol), block, - VAR_DOMAIN, &is_this_fld); + wsym = lookup_symbol (SYMBOL_LINKAGE_NAME (msymbol), + block, VAR_DOMAIN, + &is_this_fld); if (wsym) { @@ -326,8 +319,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, wtype = unresolved_elttype; } vt_val = value_at (wtype, vt_address); - common_val_print (vt_val, stream, recurse + 1, options, - current_language); + common_val_print (vt_val, stream, recurse + 1, + options, current_language); if (options->pretty) { fprintf_filtered (stream, "\n"); @@ -336,9 +329,10 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, } } - /* Return number of characters printed, including the terminating - '\0' if we reached the end. val_print_string takes care including - the terminating '\0' if necessary. */ + /* Return number of characters printed, including the + terminating '\0' if we reached the end. val_print_string + takes care including the terminating '\0' if + necessary. */ return i; } break; @@ -360,10 +354,19 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, { if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF) { - struct value *deref_val = - value_at - (TYPE_TARGET_TYPE (type), - unpack_pointer (type, valaddr + embedded_offset)); + struct value *deref_val; + + deref_val = coerce_ref_if_computed (original_value); + if (deref_val != NULL) + { + /* More complicated computed references are not supported. */ + gdb_assert (embedded_offset == 0); + } + else + deref_val = value_at (TYPE_TARGET_TYPE (type), + unpack_pointer (type, + (valaddr + + embedded_offset))); common_val_print (deref_val, stream, recurse, options, current_language); @@ -381,15 +384,18 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, } /* Fall through. */ case TYPE_CODE_STRUCT: - /*FIXME: Abstract this away */ + /*FIXME: Abstract this away. */ if (options->vtblprint && cp_is_vtbl_ptr_type (type)) { /* Print the unmangled name if desired. */ /* Print vtable entry - we only get here if NOT using - -fvtable_thunks. (Otherwise, look under TYPE_CODE_PTR.) */ - int offset = (embedded_offset + - TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8); - struct type *field_type = TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET); + -fvtable_thunks. (Otherwise, look under + TYPE_CODE_PTR.) */ + int offset = (embedded_offset + + TYPE_FIELD_BITPOS (type, + VTBL_FNADDR_OFFSET) / 8); + struct type *field_type = TYPE_FIELD_TYPE (type, + VTBL_FNADDR_OFFSET); CORE_ADDR addr = extract_typed_address (valaddr + offset, field_type); @@ -398,15 +404,17 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, } else cp_print_value_fields_rtti (type, valaddr, - embedded_offset, address, stream, - recurse, original_value, options, NULL, 0); + embedded_offset, address, + stream, recurse, + original_value, options, + NULL, 0); break; case TYPE_CODE_ENUM: if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); break; } len = TYPE_NFIELDS (type); @@ -423,30 +431,63 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, { fputs_filtered (TYPE_FIELD_NAME (type, i), stream); } - else + else if (TYPE_FLAG_ENUM (type)) { - print_longest (stream, 'd', 0, val); + int first = 1; + + /* We have a "flag" enum, so we try to decompose it into + pieces as appropriate. A flag enum has disjoint + constants by definition. */ + fputs_filtered ("(", stream); + for (i = 0; i < len; ++i) + { + QUIT; + + if ((val & TYPE_FIELD_BITPOS (type, i)) != 0) + { + if (!first) + fputs_filtered (" | ", stream); + first = 0; + + val &= ~TYPE_FIELD_BITPOS (type, i); + fputs_filtered (TYPE_FIELD_NAME (type, i), stream); + } + } + + if (first || val != 0) + { + if (!first) + fputs_filtered (" | ", stream); + fputs_filtered ("unknown: ", stream); + print_longest (stream, 'd', 0, val); + } + + fputs_filtered (")", stream); } + else + print_longest (stream, 'd', 0, val); break; case TYPE_CODE_FLAGS: if (options->format) - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); else - val_print_type_code_flags (type, valaddr + embedded_offset, stream); + val_print_type_code_flags (type, valaddr + embedded_offset, + stream); break; case TYPE_CODE_FUNC: case TYPE_CODE_METHOD: if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); break; } - /* FIXME, we should consider, at least for ANSI C language, eliminating - the distinction made between FUNCs and POINTERs to FUNCs. */ + /* FIXME, we should consider, at least for ANSI C language, + eliminating the distinction made between FUNCs and POINTERs + to FUNCs. */ fprintf_filtered (stream, "{"); type_print (type, "", stream, -1); fprintf_filtered (stream, "} "); @@ -460,8 +501,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, struct value_print_options opts = *options; opts.format = (options->format ? options->format : options->output_format); - print_scalar_formatted (valaddr + embedded_offset, type, - &opts, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, &opts, 0, stream); } else { @@ -477,12 +518,12 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, case TYPE_CODE_RANGE: /* FIXME: create_range_type does not set the unsigned bit in a - range type (I think it probably should copy it from the target - type), so we won't print values which are too large to + range type (I think it probably should copy it from the + target type), so we won't print values which are too large to fit in a signed integer correctly. */ /* FIXME: Doesn't handle ranges of enums correctly. (Can't just - print with the target type, though, because the size of our type - and the target type might differ). */ + print with the target type, though, because the size of our + type and the target type might differ). */ /* FALLTHROUGH */ case TYPE_CODE_INT: @@ -492,20 +533,21 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, opts.format = (options->format ? options->format : options->output_format); - print_scalar_formatted (valaddr + embedded_offset, type, - &opts, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, &opts, 0, stream); } else { - val_print_type_code_int (type, valaddr + embedded_offset, stream); - /* C and C++ has no single byte int type, char is used instead. - Since we don't know whether the value is really intended to - be used as an integer or a character, print the character - equivalent as well. */ + val_print_type_code_int (type, valaddr + embedded_offset, + stream); + /* C and C++ has no single byte int type, char is used + instead. Since we don't know whether the value is really + intended to be used as an integer or a character, print + the character equivalent as well. */ if (c_textual_element_type (unresolved_type, options->format)) { fputs_filtered (" ", stream); - LA_PRINT_CHAR ((unsigned char) unpack_long (type, valaddr + embedded_offset), + LA_PRINT_CHAR (unpack_long (type, valaddr + embedded_offset), unresolved_type, stream); } } @@ -517,8 +559,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, struct value_print_options opts = *options; opts.format = (options->format ? options->format : options->output_format); - print_scalar_formatted (valaddr + embedded_offset, type, - &opts, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, &opts, 0, stream); } else { @@ -528,15 +570,15 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, else fprintf_filtered (stream, "%d", (int) val); fputs_filtered (" ", stream); - LA_PRINT_CHAR ((unsigned char) val, unresolved_type, stream); + LA_PRINT_CHAR (val, unresolved_type, stream); } break; case TYPE_CODE_FLT: if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); } else { @@ -546,10 +588,11 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, case TYPE_CODE_DECFLOAT: if (options->format) - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); else - print_decimal_floating (valaddr + embedded_offset, type, stream); + print_decimal_floating (valaddr + embedded_offset, + type, stream); break; case TYPE_CODE_VOID: @@ -561,26 +604,30 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, break; case TYPE_CODE_UNDEF: - /* This happens (without TYPE_FLAG_STUB set) on systems which don't use - dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar" - and no complete type for struct foo in that file. */ + /* This happens (without TYPE_FLAG_STUB set) on systems which + don't use dbx xrefs (NO_DBX_XREFS in gcc) if a file has a + "struct foo *bar" and no complete type for struct foo in that + file. */ fprintf_filtered (stream, _("")); break; case TYPE_CODE_COMPLEX: if (options->format) - print_scalar_formatted (valaddr + embedded_offset, - TYPE_TARGET_TYPE (type), - options, 0, stream); + val_print_scalar_formatted (TYPE_TARGET_TYPE (type), + valaddr, embedded_offset, + original_value, options, 0, stream); else - print_floating (valaddr + embedded_offset, TYPE_TARGET_TYPE (type), + print_floating (valaddr + embedded_offset, + TYPE_TARGET_TYPE (type), stream); fprintf_filtered (stream, " + "); if (options->format) - print_scalar_formatted (valaddr + embedded_offset - + TYPE_LENGTH (TYPE_TARGET_TYPE (type)), - TYPE_TARGET_TYPE (type), - options, 0, stream); + val_print_scalar_formatted (TYPE_TARGET_TYPE (type), + valaddr, + embedded_offset + + TYPE_LENGTH (TYPE_TARGET_TYPE (type)), + original_value, + options, 0, stream); else print_floating (valaddr + embedded_offset + TYPE_LENGTH (TYPE_TARGET_TYPE (type)), @@ -590,13 +637,14 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, break; default: - error (_("Invalid C/C++ type code %d in symbol table."), TYPE_CODE (type)); + error (_("Invalid C/C++ type code %d in symbol table."), + TYPE_CODE (type)); } gdb_flush (stream); return (0); } -int +void c_value_print (struct value *val, struct ui_file *stream, const struct value_print_options *options) { @@ -629,10 +677,11 @@ c_value_print (struct value *val, struct ui_file *stream, if (TYPE_CODE (val_type) == TYPE_CODE_PTR && TYPE_NAME (val_type) == NULL && TYPE_NAME (TYPE_TARGET_TYPE (val_type)) != NULL - && (strcmp (TYPE_NAME (TYPE_TARGET_TYPE (val_type)), "char") == 0 + && (strcmp (TYPE_NAME (TYPE_TARGET_TYPE (val_type)), + "char") == 0 || textual_name (TYPE_NAME (TYPE_TARGET_TYPE (val_type))))) { - /* Print nothing */ + /* Print nothing. */ } else if (options->objectprint && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS)) @@ -641,36 +690,34 @@ c_value_print (struct value *val, struct ui_file *stream, if (TYPE_CODE(type) == TYPE_CODE_REF) { /* Copy value, change to pointer, so we don't get an - * error about a non-pointer type in value_rtti_target_type - */ + error about a non-pointer type in + value_rtti_target_type. */ struct value *temparg; temparg=value_copy(val); - deprecated_set_value_type (temparg, lookup_pointer_type (TYPE_TARGET_TYPE(type))); - val=temparg; + deprecated_set_value_type + (temparg, lookup_pointer_type (TYPE_TARGET_TYPE (type))); + val = temparg; } - /* Pointer to class, check real type of object */ + /* Pointer to class, check real type of object. */ fprintf_filtered (stream, "("); - real_type = value_rtti_target_type (val, &full, &top, &using_enc); - if (real_type) - { - /* RTTI entry found */ - if (TYPE_CODE (type) == TYPE_CODE_PTR) - { - /* create a pointer type pointing to the real type */ - type = lookup_pointer_type (real_type); - } - else - { - /* create a reference type referencing the real type */ - type = lookup_reference_type (real_type); - } - /* JYG: Need to adjust pointer value. */ - /* NOTE: cagney/2005-01-02: THIS IS BOGUS. */ - value_contents_writeable (val)[0] -= top; - - /* Note: When we look up RTTI entries, we don't get any - information on const or volatile attributes */ - } + + if (value_entirely_available (val)) + { + real_type = value_rtti_indirect_type (val, &full, &top, + &using_enc); + if (real_type) + { + /* RTTI entry found. */ + type = real_type; + + /* Need to adjust pointer value. */ + val = value_from_pointer (type, value_as_address (val) - top); + + /* Note: When we look up RTTI entries, we don't get + any information on const or volatile + attributes. */ + } + } type_print (type, "", stream, -1); fprintf_filtered (stream, ") "); val_type = type; @@ -689,39 +736,43 @@ c_value_print (struct value *val, struct ui_file *stream, if (options->objectprint && (TYPE_CODE (type) == TYPE_CODE_CLASS)) { - /* Attempt to determine real type of object */ + /* Attempt to determine real type of object. */ real_type = value_rtti_type (val, &full, &top, &using_enc); if (real_type) { - /* We have RTTI information, so use it */ - val = value_full_object (val, real_type, full, top, using_enc); + /* We have RTTI information, so use it. */ + val = value_full_object (val, real_type, + full, top, using_enc); fprintf_filtered (stream, "(%s%s) ", TYPE_NAME (real_type), full ? "" : _(" [incomplete object]")); - /* Print out object: enclosing type is same as real_type if full */ - return val_print (value_enclosing_type (val), - value_contents_for_printing (val), 0, - value_address (val), stream, 0, - val, &opts, current_language); - /* Note: When we look up RTTI entries, we don't get any information on - const or volatile attributes */ + /* Print out object: enclosing type is same as real_type if + full. */ + val_print (value_enclosing_type (val), + value_contents_for_printing (val), 0, + value_address (val), stream, 0, + val, &opts, current_language); + return; + /* Note: When we look up RTTI entries, we don't get any + information on const or volatile attributes. */ } else if (type != check_typedef (value_enclosing_type (val))) { - /* No RTTI information, so let's do our best */ + /* No RTTI information, so let's do our best. */ fprintf_filtered (stream, "(%s ?) ", TYPE_NAME (value_enclosing_type (val))); - return val_print (value_enclosing_type (val), - value_contents_for_printing (val), 0, - value_address (val), stream, 0, - val, &opts, current_language); + val_print (value_enclosing_type (val), + value_contents_for_printing (val), 0, + value_address (val), stream, 0, + val, &opts, current_language); + return; } - /* Otherwise, we end up at the return outside this "if" */ + /* Otherwise, we end up at the return outside this "if". */ } - return val_print (val_type, value_contents_for_printing (val), - value_embedded_offset (val), - value_address (val), - stream, 0, - val, &opts, current_language); + val_print (val_type, value_contents_for_printing (val), + value_embedded_offset (val), + value_address (val), + stream, 0, + val, &opts, current_language); }