FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Print void types correctly in Rust

Browse source 
Rust prefers to not specify the return type of a function when it is unit
(`()`). The type is also referred to as "void" in debuginfo but not in actual
usage, so we should never be printing "void" when the language is Rust.

2016-06-27  Manish Goregaokar  <manish@mozilla.com>

gdb/ChangeLog:
    * rust-lang.c (rust_print_type): Print unit types as "()"
    * rust-lang.c (rust_print_type): Omit return type for functions
    returning unit

gdb/testsuite/ChangeLog:
    * gdb.rust/simple.rs: Add test for returning unit in a function
    * gdb.rust/simple.exp: Add expectation for functions returning unit
This commit is contained in:
Manish Goregaokar 2016-06-27 21:16:59 +05:30
parent 45a54ee577
commit 921d8f549f
No known key found for this signature in database
GPG key ID: 3BBF4D3E2EF79F98
5 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gdb/rust-lang.c
View file

@ -446,7 +446,7 @@ static const struct generic_val_print_decorations rust_decorations =
" * I",
"true",
"false",
"void",
"()",
"[",
"]"
};
@ -729,13 +729,22 @@ rust_print_type (struct type *type, const char *varstring,
if (show <= 0
&& TYPE_NAME (type) != NULL)
{
fputs_filtered (TYPE_NAME (type), stream);
/* Rust calls the unit type "void" in its debuginfo,
but we don't want to print it as that. */
if (TYPE_CODE (type) == TYPE_CODE_VOID)
fputs_filtered ("()", stream);
else
fputs_filtered (TYPE_NAME (type), stream);
return;
}
type = check_typedef (type);
switch (TYPE_CODE (type))
{
case TYPE_CODE_VOID:
fputs_filtered ("()", stream);
break;
case TYPE_CODE_FUNC:
/* Delegate varargs to the C printer. */
if (TYPE_VARARGS (type))
@ -753,8 +762,13 @@ rust_print_type (struct type *type, const char *varstring,
rust_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0,
flags);
}
fputs_filtered (") -> ", stream);
rust_print_type (TYPE_TARGET_TYPE (type), "", stream, -1, 0, flags);
fputs_filtered (")", stream);
/* If it returns unit, we can omit the return type. */
if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
{
fputs_filtered (" -> ", stream);
rust_print_type (TYPE_TARGET_TYPE (type), "", stream, -1, 0, flags);
}
break;
case TYPE_CODE_ARRAY: