forked from Imagelibrary/binutils-gdb
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
This commit is contained in:
@@ -981,7 +981,7 @@ compile_cplus_convert_func (compile_cplus_instance *instance,
|
||||
gcc_type return_type = instance->convert_type (target_type);
|
||||
|
||||
std::vector<gcc_type> elements (type->num_fields ());
|
||||
struct gcc_type_array array = { type->num_fields (), elements.data () };
|
||||
struct gcc_type_array array = { (int) type->num_fields (), elements.data () };
|
||||
int artificials = 0;
|
||||
for (int i = 0; i < type->num_fields (); ++i)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user