diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 940300f95a9..cc782cb4933 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2018-10-31 Andrew Burgess + + * dwarf2read.c (struct dwarf2_cu): Add producer_is_icc field. + (producer_is_icc): New function. + (check_producer): Set producer_is_icc field on dwarf2_cu. + (dwarf2_init_integer_type): New function. + (read_base_type): Call dwarf2_init_integer_type instead of + init_integer_type in all cases. + (dwarf2_cu::dwarf2_cu): Initialise producer_is_icc field. + * valprint.c (maybe_negate_by_bytes): Add an assertion that the + LEN is greater than 0. + 2018-10-30 Tom Tromey * main.c (captured_main_1): Check return value of bfd_init. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 1b4f966cc35..b237c81fe4f 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -551,6 +551,7 @@ struct dwarf2_cu unsigned int checked_producer : 1; unsigned int producer_is_gxx_lt_4_6 : 1; unsigned int producer_is_gcc_lt_4_3 : 1; + bool producer_is_icc : 1; unsigned int producer_is_icc_lt_14 : 1; bool producer_is_codewarrior : 1; @@ -11363,6 +11364,19 @@ producer_is_icc_lt_14 (struct dwarf2_cu *cu) return cu->producer_is_icc_lt_14; } +/* ICC generates a DW_AT_type for C void functions. This was observed on + ICC 14.0.5.212, and appears to be against the DWARF spec (V5 3.3.2) + which says that void functions should not have a DW_AT_type. */ + +static bool +producer_is_icc (struct dwarf2_cu *cu) +{ + if (!cu->checked_producer) + check_producer (cu); + + return cu->producer_is_icc; +} + /* Check for possibly missing DW_AT_comp_dir with relative .debug_line directory paths. GCC SVN r127613 (new option -fdebug-prefix-map) fixed this, it was first present in GCC release 4.3.0. */ @@ -14897,7 +14911,10 @@ check_producer (struct dwarf2_cu *cu) cu->producer_is_gcc_lt_4_3 = major < 4 || (major == 4 && minor < 3); } else if (producer_is_icc (cu->producer, &major, &minor)) - cu->producer_is_icc_lt_14 = major < 14; + { + cu->producer_is_icc = true; + cu->producer_is_icc_lt_14 = major < 14; + } else if (startswith (cu->producer, "CodeWarrior S12/L-ISA")) cu->producer_is_codewarrior = true; else @@ -17494,6 +17511,25 @@ dwarf2_init_float_type (struct objfile *objfile, int bits, const char *name, return type; } +/* Allocate an integer type of size BITS and name NAME. */ + +static struct type * +dwarf2_init_integer_type (struct dwarf2_cu *cu, struct objfile *objfile, + int bits, int unsigned_p, const char *name) +{ + struct type *type; + + /* Versions of Intel's C Compiler generate an integer type called "void" + instead of using DW_TAG_unspecified_type. This has been seen on + at least versions 14, 17, and 18. */ + if (bits == 0 && producer_is_icc (cu) && strcmp (name, "void") == 0) + type = objfile_type (objfile)->builtin_void; + else + type = init_integer_type (objfile, bits, unsigned_p, name); + + return type; +} + /* Find a representation of a given base type and install it in the TYPE field of the die. */ @@ -17543,7 +17579,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) type = dwarf2_init_float_type (objfile, bits, name, name); break; case DW_ATE_signed: - type = init_integer_type (objfile, bits, 0, name); + type = dwarf2_init_integer_type (cu, objfile, bits, 0, name); break; case DW_ATE_unsigned: if (cu->language == language_fortran @@ -17551,7 +17587,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) && startswith (name, "character(")) type = init_character_type (objfile, bits, 1, name); else - type = init_integer_type (objfile, bits, 1, name); + type = dwarf2_init_integer_type (cu, objfile, bits, 1, name); break; case DW_ATE_signed_char: if (cu->language == language_ada || cu->language == language_m2 @@ -17559,7 +17595,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) || cu->language == language_fortran) type = init_character_type (objfile, bits, 0, name); else - type = init_integer_type (objfile, bits, 0, name); + type = dwarf2_init_integer_type (cu, objfile, bits, 0, name); break; case DW_ATE_unsigned_char: if (cu->language == language_ada || cu->language == language_m2 @@ -17568,7 +17604,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) || cu->language == language_rust) type = init_character_type (objfile, bits, 1, name); else - type = init_integer_type (objfile, bits, 1, name); + type = dwarf2_init_integer_type (cu, objfile, bits, 1, name); break; case DW_ATE_UTF: { @@ -17582,7 +17618,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) { complaint (_("unsupported DW_ATE_UTF bit size: '%d'"), bits); - type = init_integer_type (objfile, bits, 1, name); + type = dwarf2_init_integer_type (cu, objfile, bits, 1, name); } return set_die_type (die, type, cu); } @@ -25129,6 +25165,7 @@ dwarf2_cu::dwarf2_cu (struct dwarf2_per_cu_data *per_cu_) checked_producer (0), producer_is_gxx_lt_4_6 (0), producer_is_gcc_lt_4_3 (0), + producer_is_icc (false), producer_is_icc_lt_14 (0), producer_is_codewarrior (false), processing_has_namespace_info (0) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index cf0da029e40..8fa6b0d674f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-10-31 Andrew Burgess + + * gdb.dwarf2/void-type.c: New file. + * gdb.dwarf2/void-type.exp: New file. + 2018-10-27 Philippe Waroquiers * gdb.base/info_qt.c: New file. diff --git a/gdb/testsuite/gdb.dwarf2/void-type.c b/gdb/testsuite/gdb.dwarf2/void-type.c new file mode 100644 index 00000000000..8a88dc25df4 --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/void-type.c @@ -0,0 +1,36 @@ +/* Copyright (C) 2018 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int var_a = 5; + +void *var_ptr = &var_a; + +__attribute__((noinline)) void +func () +{ + asm ("func_label: .globl func_label"); + asm ("" ::: "memory"); + return; +} + +int +main () +{ + asm ("main_label: .globl main_label"); + func (); + return 0; +} diff --git a/gdb/testsuite/gdb.dwarf2/void-type.exp b/gdb/testsuite/gdb.dwarf2/void-type.exp new file mode 100644 index 00000000000..3691bff7792 --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/void-type.exp @@ -0,0 +1,125 @@ +# Copyright 2018 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This tests some non-standard DWARF spotted in an Intel C Compiler +# generated binary. +# +# The DWARF standard (V5 3.3.2) says that a void C function should not +# have a DW_AT_type attribute, however, an ICC compiled binary was +# found to have a DW_AT_type that referenced a signed integer type, of +# size 0, with the name 'void'. +# +# This 'void' integer type would cause GDB to crash in some cases, one +# that was seen was when using 'finish' to leave the void function. + +load_lib dwarf.exp + +# This test can only be run on targets which support DWARF-2 and use gas. +if {![dwarf2_support]} { + return 0 +} + +standard_testfile void-type.c void-type.S + +# Make some DWARF for the test. +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + global srcdir subdir srcfile + + set func_result [function_range func ${srcdir}/${subdir}/${srcfile}] + set func_start [lindex $func_result 0] + set func_length [lindex $func_result 1] + + set main_result [function_range main ${srcdir}/${subdir}/${srcfile}] + set main_start [lindex $main_result 0] + set main_length [lindex $main_result 1] + + cu {} { + DW_TAG_compile_unit { + {DW_AT_producer "Intel(R) C Intel(R) 64 Compiler XE for applications running on Intel(R) 64, Version 14.0.5.212 Build 20150212"} + {DW_AT_language @DW_LANG_C} + {DW_AT_name void-type.c} + {DW_AT_comp_dir /tmp} + } { + declare_labels main_type int_type ptr_type + + main_type: DW_TAG_base_type { + {DW_AT_byte_size 4 DW_FORM_sdata} + {DW_AT_encoding @DW_ATE_signed} + {DW_AT_name int} + } + + int_type: DW_TAG_base_type { + {DW_AT_byte_size 0 DW_FORM_sdata} + {DW_AT_encoding @DW_ATE_signed} + {DW_AT_name void} + } + + ptr_type: DW_TAG_pointer_type { + {DW_AT_type :$int_type} + } + + DW_TAG_subprogram { + {name func} + {low_pc $func_start addr} + {high_pc "$func_start + $func_length" addr} + {type :$int_type} + } + DW_TAG_subprogram { + {name main} + {low_pc $main_start addr} + {high_pc "$main_start + $main_length" addr} + {type :$main_type} + } + + DW_TAG_variable { + {DW_AT_name "var_a"} + {DW_AT_type :$int_type} + {DW_AT_external 1 DW_FORM_flag} + {DW_AT_location {DW_OP_addr [gdb_target_symbol "var_a"]} SPECIAL_expr} + } + + DW_TAG_variable { + {DW_AT_name "var_ptr"} + {DW_AT_type :$ptr_type} + {DW_AT_external 1 DW_FORM_flag} + {DW_AT_location {DW_OP_addr [gdb_target_symbol "var_ptr"]} SPECIAL_expr} + } + } + } +} + +if { [prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug}] } { + return -1 +} + +if ![runto_main] { + return -1 +} + +# Place a breakpoint in 'func' and continue to there. +gdb_breakpoint func +gdb_continue_to_breakpoint "func" + +# Check how GDB handles the void* variable. +gdb_test "p *var_ptr" "Attempt to dereference a generic pointer." \ + "check that dereferencing a void* gives a suitable message" + +# Now finish, returning to main. +gdb_test "finish" [multi_line \ + "Run till exit from #0 $hex in func \\\(\\\)" \ + "$hex in main \\\(\\\)"] \ + "check that finish completes" diff --git a/gdb/valprint.c b/gdb/valprint.c index 2b63a91e8df..b2236f89318 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -1604,6 +1604,7 @@ maybe_negate_by_bytes (const gdb_byte *bytes, unsigned len, gdb::byte_vector *out_vec) { gdb_byte sign_byte; + gdb_assert (len > 0); if (byte_order == BFD_ENDIAN_BIG) sign_byte = bytes[0]; else