diff options
| -rw-r--r-- | gdb/defs.h | 7 | ||||
| -rw-r--r-- | gdb/rust-lang.h | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.rust/methods.exp | 3 |
3 files changed, 8 insertions, 6 deletions
@@ -204,9 +204,8 @@ extern void quit_serial_event_clear (void); these languages, so some symbols could be successfully demangled by several languages. For that reason, the constants here are sorted in the order we'll attempt demangling them. For example: Rust uses - C++ mangling, so must come after C++; Ada must come last (see - ada_sniff_from_mangled_name). (Keep this order in sync with the - 'languages' array in language.c.) */ + a C++-compatible mangling, so must come before C++; Ada must come + last (see ada_sniff_from_mangled_name). */ enum language { @@ -214,6 +213,7 @@ enum language language_auto, /* Placeholder for automatic setting */ language_c, /* C */ language_objc, /* Objective-C */ + language_rust, /* Rust */ language_cplus, /* C++ */ language_d, /* D */ language_go, /* Go */ @@ -222,7 +222,6 @@ enum language language_asm, /* Assembly language */ language_pascal, /* Pascal */ language_opencl, /* OpenCL */ - language_rust, /* Rust */ language_minimal, /* All other languages, minimal support only */ language_ada, /* Ada */ nr_languages diff --git a/gdb/rust-lang.h b/gdb/rust-lang.h index 37a22e7..efe721c 100644 --- a/gdb/rust-lang.h +++ b/gdb/rust-lang.h @@ -93,7 +93,7 @@ public: (const char *mangled, gdb::unique_xmalloc_ptr<char> *demangled) const override { - *demangled = gdb_demangle (mangled, DMGL_PARAMS | DMGL_ANSI); + demangled->reset (rust_demangle (mangled, 0)); return *demangled != NULL; } @@ -102,7 +102,7 @@ public: gdb::unique_xmalloc_ptr<char> demangle_symbol (const char *mangled, int options) const override { - return gdb_demangle (mangled, options); + return gdb::unique_xmalloc_ptr<char> (rust_demangle (mangled, options)); } /* See language.h. */ diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp index 8374ab1..72be6a1 100644 --- a/gdb/testsuite/gdb.rust/methods.exp +++ b/gdb/testsuite/gdb.rust/methods.exp @@ -59,3 +59,6 @@ gdb_test "print *self" " = 23" gdb_test "info functions HasMethods::new" \ "fn methods::HasMethods::new\\(\\) -> methods::HasMethods;" +# Regression test for PR rust/20367 and PR rust/30211. This used to +# crash. +gdb_test_no_output "complete break what" |