diff options
author | Tom Tromey <tom@tromey.com> | 2017-10-02 13:55:42 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2017-10-02 14:06:48 -0600 |
commit | 45320ffa0450b27e232d933d2a1c6a09d94ac18b (patch) | |
tree | 82e528f5a61c63c6b01d67694039d754c7fad440 /gdb | |
parent | b3e3859bc577db5b79bb3d39048fd46c0a0420ef (diff) | |
download | gdb-45320ffa0450b27e232d933d2a1c6a09d94ac18b.zip gdb-45320ffa0450b27e232d933d2a1c6a09d94ac18b.tar.gz gdb-45320ffa0450b27e232d933d2a1c6a09d94ac18b.tar.bz2 |
Fix &str printing in Rust
Printing a string slice ("&str") in Rust would print until the
terminating \0; but that is incorrect because a slice has a length.
This fixes &str printing, and arranges to preserve the type name when
slicing a slice, so that printing a slice of an "&str" works as well.
This is PR rust/22236.
2017-10-02 Tom Tromey <tom@tromey.com>
PR rust/22236:
* rust-lang.c (rust_val_print_str): New function.
(val_print_struct): Call it.
(rust_subscript): Preserve name of slice type.
2017-10-02 Tom Tromey <tom@tromey.com>
PR rust/22236:
* gdb.rust/simple.rs (main): New variable "fslice".
* gdb.rust/simple.exp: Add slice tests. Update string tests.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/rust-lang.c | 29 | ||||
-rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/simple.exp | 12 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/simple.rs | 2 |
5 files changed, 48 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 11c1ca3..e0cf4c0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2017-10-02 Tom Tromey <tom@tromey.com> + PR rust/22236: + * rust-lang.c (rust_val_print_str): New function. + (val_print_struct): Call it. + (rust_subscript): Preserve name of slice type. + +2017-10-02 Tom Tromey <tom@tromey.com> + * rust-lang.c (rust_subscript): Handle slices in EVAL_AVOID_SIDE_EFFECTS case. diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 9b64efa..261ddb1 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -467,6 +467,21 @@ rust_printstr (struct ui_file *stream, struct type *type, +/* Helper function to print a string slice. */ + +static void +rust_val_print_str (struct ui_file *stream, struct value *val, + const struct value_print_options *options) +{ + struct value *base = value_struct_elt (&val, NULL, "data_ptr", NULL, + "slice"); + struct value *len = value_struct_elt (&val, NULL, "length", NULL, "slice"); + + val_print_string (TYPE_TARGET_TYPE (value_type (base)), "UTF-8", + value_as_address (base), value_as_long (len), stream, + options); +} + /* rust_print_type branch for structs and untagged unions. */ static void @@ -477,6 +492,13 @@ val_print_struct (struct type *type, int embedded_offset, { int i; int first_field; + + if (rust_slice_type_p (type) && strcmp (TYPE_NAME (type), "&str") == 0) + { + rust_val_print_str (stream, val, options); + return; + } + bool is_tuple = rust_tuple_type_p (type); bool is_tuple_struct = !is_tuple && rust_tuple_struct_type_p (type); struct value_print_options opts; @@ -1562,8 +1584,11 @@ rust_subscript (struct expression *exp, int *pos, enum noside noside, usize = language_lookup_primitive_type (exp->language_defn, exp->gdbarch, "usize"); - slice = rust_slice_type ("&[*gdb*]", value_type (result), - usize); + const char *new_name = ((type != nullptr + && rust_slice_type_p (type)) + ? TYPE_NAME (type) : "&[*gdb*]"); + + slice = rust_slice_type (new_name, value_type (result), usize); addrval = value_allocate_space_in_inferior (TYPE_LENGTH (slice)); addr = value_as_long (addrval); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 296878c..4de56f7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2017-10-02 Tom Tromey <tom@tromey.com> + PR rust/22236: + * gdb.rust/simple.rs (main): New variable "fslice". + * gdb.rust/simple.exp: Add slice tests. Update string tests. + +2017-10-02 Tom Tromey <tom@tromey.com> + * gdb.rust/simple.exp: Test ptype of a slice. 2017-10-02 Tom Tromey <tom@tromey.com> diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index b01841f..90516b9 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -64,6 +64,10 @@ gdb_test "ptype j2" " = struct simple::Unit" gdb_test "print simple::Unit" " = simple::Unit" gdb_test "print simple::Unit{}" " = simple::Unit" +gdb_test "print f" " = \"hi bob\"" +gdb_test "print fslice" " = \"bob\"" +gdb_test "print &f\[3..\]" " = \"bob\"" + gdb_test "print g" " = \\(u8 \\(\\*\\)\\\[6\\\]\\) $hex b\"hi bob\"" gdb_test "ptype g" " = u8 \\(\\*\\)\\\[6\\\]" @@ -200,13 +204,9 @@ gdb_test "ptype empty" "fn \\(\\)" gdb_test "print (diff2 as fn(i32, i32) -> i32)(19, -2)" " = 21" -# We need the ".*" because currently we don't extract the length and -# use it to intelligently print the string data. -gdb_test "print \"hello rust\"" \ - " = &str \\{data_ptr: $hex \"hello rust.*\", length: 10\\}" +gdb_test "print \"hello rust\"" " = \"hello rust.*\"" gdb_test "print \"hello" "Unexpected EOF in string" -gdb_test "print r##\"hello \" rust\"##" \ - " = &str \\{data_ptr: $hex \"hello \\\\\" rust.*\", length: 12\\}" +gdb_test "print r##\"hello \" rust\"##" " = \"hello \\\\\" rust.*\"" gdb_test "print r\"hello" "Unexpected EOF in string" gdb_test "print r###\"###hello\"" "Unexpected EOF in string" gdb_test "print r###\"###hello\"##" "Unexpected EOF in string" diff --git a/gdb/testsuite/gdb.rust/simple.rs b/gdb/testsuite/gdb.rust/simple.rs index 9c154e7..d6d1755 100644 --- a/gdb/testsuite/gdb.rust/simple.rs +++ b/gdb/testsuite/gdb.rust/simple.rs @@ -95,6 +95,8 @@ fn main () { let g = b"hi bob"; let h = b'9'; + let fslice = &f[3..]; + let i = ["whatever"; 8]; let j = Unit; |