diff options
| author | Tom Tromey <tromey@adacore.com> | 2023-01-11 12:42:40 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2023-02-09 07:55:34 -0700 |
| commit | 1775f8b3804744c22611ed0c9fd2df4f5b4d8641 (patch) | |
| tree | 06c240bfc9fe68afe224cfc4e9bddc3e09e7850b /gdb/gdbtypes.h | |
| parent | 119f6cfbd0236c9684a8a12ff9241dc834418309 (diff) | |
| download | binutils-gdb-1775f8b3804744c22611ed0c9fd2df4f5b4d8641.tar.gz | |
Increase size of main_type::nfields
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.
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.
This is v2 of this patch, which has these changes:
* 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.)
* 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.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29985
Diffstat (limited to 'gdb/gdbtypes.h')
| -rw-r--r-- | gdb/gdbtypes.h | 10 |
1 files changed, 5 insertions, 5 deletions
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. */ - short nfields; + unsigned int m_nfields; /* * Name of this type, or NULL if none. @@ -944,15 +944,15 @@ struct type } /* 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; } /* 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 = num_fields; + this->main_type->m_nfields = num_fields; } /* Get the fields array of this type. */ |