-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: rust-lang/rust#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 53e710a ("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. (cherry picked from commit 1c0e436)
- Loading branch information
Showing
4 changed files
with
75 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
# Copyright 2021 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 <http://www.gnu.org/licenses/>. | ||
|
||
# Test DW_ATE_UTF for Rust. | ||
|
||
load_lib dwarf.exp | ||
|
||
# This test can only be run on targets which support DWARF-2 and use | ||
# gas. | ||
if {![dwarf2_support]} { | ||
return 0 | ||
} | ||
|
||
standard_testfile main.c .S | ||
|
||
# Make some DWARF for the test. | ||
set asm_file [standard_output_file $srcfile2] | ||
Dwarf::assemble $asm_file { | ||
upvar cu_lang cu_lang | ||
|
||
declare_labels char_label | ||
|
||
# Creating a CU with 4-byte addresses lets this test link on | ||
# both 32- and 64-bit machines. | ||
cu { addr_size 4 } { | ||
compile_unit { | ||
{name file1.txt} | ||
{language @DW_LANG_Rust} | ||
} { | ||
char_label: DW_TAG_base_type { | ||
{DW_AT_byte_size 4 DW_FORM_sdata} | ||
{DW_AT_encoding @DW_ATE_UTF} | ||
{DW_AT_name char} | ||
} | ||
|
||
DW_TAG_variable { | ||
{name cvalue} | ||
{type :$char_label} | ||
{const_value 97 DW_FORM_udata} | ||
} | ||
} | ||
} | ||
} | ||
|
||
if {[prepare_for_testing "failed to prepare" ${testfile} \ | ||
[list $srcfile $asm_file] debug]} { | ||
return -1 | ||
} | ||
|
||
if {![runto main]} { | ||
return -1 | ||
} | ||
|
||
gdb_test "set language rust" \ | ||
"Warning: the current language does not match this frame." | ||
# Get the values into history so we can use it from Rust. | ||
gdb_test "print cvalue" "\\\$1 = 97 'a'" |