[Bug rust/29735] Can't have multiple breakpoints - crash otherwise

["tpzker at thepuzzlemaker dot info" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=29735

--- Comment #9 from The Puzzlemaker <tpzker at thepuzzlemaker dot info> ---
Comment on attachment 15198
  --> https://sourceware.org/bugzilla/attachment.cgi?id=15198
Patch for this issue, or an issue similar to it

>From 07bb370168aab780c4780435ad3d9257ad8a474b Mon Sep 17 00:00:00 2001
>From: ThePuzzlemaker <tpzker@thepuzzlemaker.info>
>Date: Sat, 28 Oct 2023 13:28:33 -0500
>Subject: [PATCH] Fix assertion fail from `rust_lang::print_enum`
>
>This commit fixes an assertion fail in `rust_lang::print_enum` related
>to the handling of field numbers for variant types.
>---
> gdb/rust-lang.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
>diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
>index 74808ad0716..9acd2e1d2fa 100644
>--- a/gdb/rust-lang.c
>+++ b/gdb/rust-lang.c
>@@ -470,8 +470,18 @@ rust_language::print_enum (struct value *val, struct ui_file *stream,
>     }
> 
>   int variant_fieldno = rust_enum_variant (type);
>-  val = value_field (val, variant_fieldno);
>   struct type *variant_type = type->field (variant_fieldno).type ();
>+  /* HACK: variant_fieldno is indexed in 'type', which has the field
>+     disabled for other variants. The type of 'val' does not. Thus,
>+     iterate through the fields and find the one that matches. */
>+  for (int i = 0; i < value_type (val)->num_fields (); i++) {
>+    value* new_val = value_field (val, i);
>+    if (types_equal (value_type (new_val), variant_type)) {
>+      val = new_val;
>+      break;
>+    }
>+  }
>+  gdb_assert(types_equal(value_type (val), variant_type));
> 
>   int nfields = variant_type->num_fields ();
> 
>-- 
>2.42.0

-- 
You are receiving this mail because:
You are on the CC list for the bug.