diff options
author | Tom Tromey <tom@tromey.com> | 2021-10-31 10:34:50 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2021-11-29 13:24:32 -0700 |
commit | 1c0e43634cfdd0ad7ef9ac3dd7d208dddeb80f5e (patch) | |
tree | 752e7aeb98cd6cef4158c9a8a7ca786ac4f6cae7 /gdb/dwarf2 | |
parent | b9db26b4c44245c0b0148ef9e711677d4e664f9f (diff) | |
download | gdb-1c0e43634cfdd0ad7ef9ac3dd7d208dddeb80f5e.zip gdb-1c0e43634cfdd0ad7ef9ac3dd7d208dddeb80f5e.tar.gz gdb-1c0e43634cfdd0ad7ef9ac3dd7d208dddeb80f5e.tar.bz2 |
Allow DW_ATE_UTF for Rust characters
The Rust compiler plans to change the encoding of a Rust 'char' type
to use DW_ATE_UTF. You can see the discussion here:
https://github.com/rust-lang/rust/pull/89887
However, this fails in gdb. I looked into this, and it turns out that
the handling of DW_ATE_UTF is currently fairly specific to C++. In
particular, the code here assumes the C++ type names, and it creates
an integer type.
This comes from commit 53e710acd ("GDB thinks char16_t and char32_t
are signed in C++"). The message says:
Both places need fixing. But since I couldn't tell why dwarf2read.c
needs to create a new type, I've made it use the per-arch built-in
types instead, so that the types are only created once per arch
instead of once per objfile. That seems to work fine.
... which is fine, but it seems to me that it's also correct to make a
new character type; and this approach is better because it preserves
the type name as well. This does use more memory, but first we
shouldn't be too concerned about the memory use of types coming from
debuginfo; and second, if we are, we should implement type interning
anyway.
Changing this code to use a character type revealed a couple of
oddities in the C/C++ handling of TYPE_CODE_CHAR. This patch fixes
these as well.
I filed PR rust/28637 for this issue, so that this patch can be
backported to the gdb 11 branch.
Diffstat (limited to 'gdb/dwarf2')
-rw-r--r-- | gdb/dwarf2/read.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 737d8a4..57538fc 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -18261,16 +18261,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) break; case DW_ATE_UTF: { - if (bits == 16) - type = builtin_type (arch)->builtin_char16; - else if (bits == 32) - type = builtin_type (arch)->builtin_char32; - else - { - complaint (_("unsupported DW_ATE_UTF bit size: '%d'"), - bits); - type = dwarf2_init_integer_type (cu, objfile, bits, 1, name); - } + type = init_character_type (objfile, bits, 1, name); return set_die_type (die, type, cu); } break; @@ -18290,7 +18281,9 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) break; } - if (name && strcmp (name, "char") == 0) + if (type->code () == TYPE_CODE_INT + && name != nullptr + && strcmp (name, "char") == 0) type->set_has_no_signedness (true); maybe_set_alignment (cu, die, type); |