From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 19A013858413; Thu, 9 Feb 2023 15:02:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 19A013858413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675954926; bh=R8MqGsA2jjV+vzzaUBb+s/eVKFHHIz3+J+blRVoLDDI=; h=From:To:Subject:Date:From; b=MHYefhjhJEDxr9if5GMNDrUZf8wuHwxc4bs2y4+lAQ+FtEDNFPdBiGZwlTtd0C+I6 pBEqtudlS4A0ceKPMD0r1ZXkxxSKZSgNZvsI9r6knqTnkFWzbT/qEMeRUwS0B7C1k3 kkD1c5pUFIoLmcP40kUfS2TO5F/s5sPeyY/JkOjU= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Increase size of main_type::nfields X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 119f6cfbd0236c9684a8a12ff9241dc834418309 X-Git-Newrev: 1775f8b3804744c22611ed0c9fd2df4f5b4d8641 Message-Id: <20230209150206.19A013858413@sourceware.org> Date: Thu, 9 Feb 2023 15:02:06 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1775f8b38047= 44c22611ed0c9fd2df4f5b4d8641 commit 1775f8b3804744c22611ed0c9fd2df4f5b4d8641 Author: Tom Tromey Date: Wed Jan 11 12:42:40 2023 -0700 Increase size of main_type::nfields =20 main_type::nfields is a 'short', and has been for many years. PR c++/29985 points out that 'short' is too narrow for an enum that contains more than 2^15 constants. =20 This patch bumps the size of 'nfields'. To verify that the field isn't directly used, it is also renamed. Note that this does not affect the size of main_type on x86-64 Fedora 36. And, if it does have a negative effect somewhere, it's worth considering that types could be shrunk more drastically by using subclasses for the different codes. =20 This is v2 of this patch, which has these changes: =20 * I changed nfields to 'unsigned', per Simon's request. I looked at changing all the uses, but this quickly fans out into a very large patch. (One additional tweak was needed, though.) =20 * I wrote a test case. I discovered that GCC cannot compile a large enough C test case, so I resorted to using the DWARF assembler. This test doesn't reproduce the crash, but it does fail without the patch. =20 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D29985 Diff: --- gdb/compile/compile-cplus-types.c | 2 +- gdb/gdb-gdb.py.in | 4 +- gdb/gdbtypes.h | 10 ++--- gdb/testsuite/gdb.dwarf2/mega-enum.exp | 67 ++++++++++++++++++++++++++++++= ++++ 4 files changed, 75 insertions(+), 8 deletions(-) diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-= types.c index 55661156b86..d48aa61b4bc 100644 --- a/gdb/compile/compile-cplus-types.c +++ b/gdb/compile/compile-cplus-types.c @@ -981,7 +981,7 @@ compile_cplus_convert_func (compile_cplus_instance *ins= tance, gcc_type return_type =3D instance->convert_type (target_type); =20 std::vector elements (type->num_fields ()); - struct gcc_type_array array =3D { type->num_fields (), elements.data () = }; + struct gcc_type_array array =3D { (int) type->num_fields (), elements.da= ta () }; int artificials =3D 0; for (int i =3D 0; i < type->num_fields (); ++i) { diff --git a/gdb/gdb-gdb.py.in b/gdb/gdb-gdb.py.in index dbc4d773e0b..95b7d84966f 100644 --- a/gdb/gdb-gdb.py.in +++ b/gdb/gdb-gdb.py.in @@ -261,8 +261,8 @@ class StructMainTypePrettyPrinter: fields.append("flags =3D [%s]" % self.flags_to_string()) fields.append("owner =3D %s" % self.owner_to_string()) fields.append("target_type =3D %s" % self.val["m_target_type"]) - if self.val["nfields"] > 0: - for fieldno in range(self.val["nfields"]): + if self.val["m_nfields"] > 0: + for fieldno in range(self.val["m_nfields"]): fields.append(self.struct_field_img(fieldno)) if self.val["code"] =3D=3D gdb.TYPE_CODE_RANGE: fields.append(self.bounds_img()) diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 18ea1bca19c..aaed12f97ee 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -818,7 +818,7 @@ struct main_type /* * Number of fields described for this type. This field appears at this location because it packs nicely here. */ =20 - short nfields; + unsigned int m_nfields; =20 /* * Name of this type, or NULL if none. =20 @@ -944,15 +944,15 @@ struct type } =20 /* Get the number of fields of this type. */ - int num_fields () const + unsigned int num_fields () const { - return this->main_type->nfields; + return this->main_type->m_nfields; } =20 /* Set the number of fields of this type. */ - void set_num_fields (int num_fields) + void set_num_fields (unsigned int num_fields) { - this->main_type->nfields =3D num_fields; + this->main_type->m_nfields =3D num_fields; } =20 /* Get the fields array of this type. */ diff --git a/gdb/testsuite/gdb.dwarf2/mega-enum.exp b/gdb/testsuite/gdb.dwa= rf2/mega-enum.exp new file mode 100644 index 00000000000..9d47931eb76 --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/mega-enum.exp @@ -0,0 +1,67 @@ +# Copyright 2023 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 . + +# Test a huge enum. A colossal enum. If you will, a mega enum. + +load_lib dwarf.exp +require dwarf2_support + +standard_testfile main.c mega-enum.S + +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + global srcfile + + cu {} { + DW_TAG_compile_unit { + {DW_AT_language @DW_LANG_C} + {DW_AT_name $srcfile} + {DW_AT_comp_dir /tmp} + } { + declare_labels integer_label + + integer_label: DW_TAG_base_type { + {DW_AT_byte_size 4 DW_FORM_sdata} + {DW_AT_encoding @DW_ATE_signed} + {DW_AT_name int} + } + + DW_TAG_enumeration_type { + {DW_AT_name mega_enum} + {DW_AT_type :$integer_label} + } { + # In the past gdb used a 'short' for the field count. + # But this fails if there are too many fields. If the + # field count here is too high, gas takes a long time; + # so use a number that's just big enough. + for {set i 0} {$i < 65538} {incr i} { + DW_TAG_enumerator { + {DW_AT_name DEI_$i} + {DW_AT_const_value $i DW_FORM_sdata} + } + } + } + } + } +} + +if {[prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug}]} { + return -1 +} + +# The largest known Fermat prime. +gdb_test "print/d DEI_65537" " =3D 65537" +gdb_test "print (enum mega_enum) 65537" " =3D DEI_65537"