Fix Rust enum test failures
Pedro pointed out that some Rust tests were failing after the recent enum change. I was able to reproduce this even with the most current Rust compiler -- no test was failing, but rather the gdb internal error was causing an "untested" result, which I didn't notice. The internal error is caused by a bad assertion in alloc_discriminant_info. This happened because, in an earlier version of the patch, the discriminant could only appear at index 0. However, it can now appear anywhere. This patch fixes the assertion in the obvious way, and adds a second assertion to ensure that the discriminant is also correct. Fixing this revealed a real failure, which was caused by using the wrong base name when computing the name of a univariant enum's sole member. This is also fixed here. Tested by running the gdb.rust tests with rustc 1.23 and double-checking the summary: # of expected passes 276 Note that if you try this yourself, it is still possible to get an "untested" result from traits.exp if your Rust compiler is old enough. 2018-03-01 Tom Tromey <tom@tromey.com> * dwarf2read.c (alloc_discriminant_info): Fix default_index assertion. Add assertion for discriminant_index. (quirk_rust_enum): Use correct base type name in univariant case.
This commit is contained in:
parent
4d354d8b89
commit
c7b15a66dc
|
@ -1,3 +1,9 @@
|
|||
2018-03-01 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* dwarf2read.c (alloc_discriminant_info): Fix default_index
|
||||
assertion. Add assertion for discriminant_index.
|
||||
(quirk_rust_enum): Use correct base type name in univariant case.
|
||||
|
||||
2018-03-01 Simon Marchi <simon.marchi@ericsson.com>
|
||||
|
||||
* record.c (get_call_history_modifiers): Return a
|
||||
|
|
|
@ -10364,8 +10364,11 @@ alloc_discriminant_info (struct type *type, int discriminant_index,
|
|||
int default_index)
|
||||
{
|
||||
gdb_assert (TYPE_CODE (type) == TYPE_CODE_UNION);
|
||||
gdb_assert (discriminant_index == -1
|
||||
|| (discriminant_index >= 0
|
||||
&& discriminant_index < TYPE_NFIELDS (type)));
|
||||
gdb_assert (default_index == -1
|
||||
|| (default_index > 0 && default_index < TYPE_NFIELDS (type)));
|
||||
|| (default_index >= 0 && default_index < TYPE_NFIELDS (type)));
|
||||
|
||||
TYPE_FLAG_DISCRIMINATED_UNION (type) = 1;
|
||||
|
||||
|
@ -10518,7 +10521,7 @@ quirk_rust_enum (struct type *type, struct objfile *objfile)
|
|||
TYPE_FIELD_NAME (union_type, 0) = variant_name;
|
||||
TYPE_NAME (field_type)
|
||||
= rust_fully_qualify (&objfile->objfile_obstack,
|
||||
TYPE_NAME (field_type), variant_name);
|
||||
TYPE_NAME (type), variant_name);
|
||||
|
||||
/* Install the union in the outer struct type. */
|
||||
TYPE_NFIELDS (type) = 1;
|
||||
|
|
Loading…
Reference in New Issue