1 files changed, 29 insertions, 49 deletions

diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index a50f3b7..407be56 100644
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -961,27 +961,6 @@ rust_slice_type (const char *name, struct type *elt_type,
   return type;
 }
 
-enum rust_primitive_types
-{
-  rust_primitive_bool,
-  rust_primitive_char,
-  rust_primitive_i8,
-  rust_primitive_u8,
-  rust_primitive_i16,
-  rust_primitive_u16,
-  rust_primitive_i32,
-  rust_primitive_u32,
-  rust_primitive_i64,
-  rust_primitive_u64,
-  rust_primitive_isize,
-  rust_primitive_usize,
-  rust_primitive_f32,
-  rust_primitive_f64,
-  rust_primitive_unit,
-  rust_primitive_str,
-  nr_rust_primitive_types
-};
-
 
 
 /* A helper for rust_evaluate_subexp that handles OP_FUNCALL.  */
@@ -1927,39 +1906,40 @@ public:
   {
     const struct builtin_type *builtin = builtin_type (gdbarch);
 
-    struct type **types
-      = GDBARCH_OBSTACK_CALLOC (gdbarch, nr_rust_primitive_types + 1,
-				struct type *);
-
-    types[rust_primitive_bool] = arch_boolean_type (gdbarch, 8, 1, "bool");
-    types[rust_primitive_char] = arch_character_type (gdbarch, 32, 1, "char");
-    types[rust_primitive_i8] = arch_integer_type (gdbarch, 8, 0, "i8");
-    types[rust_primitive_u8] = arch_integer_type (gdbarch, 8, 1, "u8");
-    types[rust_primitive_i16] = arch_integer_type (gdbarch, 16, 0, "i16");
-    types[rust_primitive_u16] = arch_integer_type (gdbarch, 16, 1, "u16");
-    types[rust_primitive_i32] = arch_integer_type (gdbarch, 32, 0, "i32");
-    types[rust_primitive_u32] = arch_integer_type (gdbarch, 32, 1, "u32");
-    types[rust_primitive_i64] = arch_integer_type (gdbarch, 64, 0, "i64");
-    types[rust_primitive_u64] = arch_integer_type (gdbarch, 64, 1, "u64");
+    /* Helper function to allow shorter lines below.  */
+    auto add  = [&] (struct type * t) -> struct type *
+    {
+      lai->add_primitive_type (t);
+      return t;
+    };
+
+    struct type *bool_type
+      = add (arch_boolean_type (gdbarch, 8, 1, "bool"));
+    add (arch_character_type (gdbarch, 32, 1, "char"));
+    add (arch_integer_type (gdbarch, 8, 0, "i8"));
+    struct type *u8_type
+      = add (arch_integer_type (gdbarch, 8, 1, "u8"));
+    add (arch_integer_type (gdbarch, 16, 0, "i16"));
+    add (arch_integer_type (gdbarch, 16, 1, "u16"));
+    add (arch_integer_type (gdbarch, 32, 0, "i32"));
+    add (arch_integer_type (gdbarch, 32, 1, "u32"));
+    add (arch_integer_type (gdbarch, 64, 0, "i64"));
+    add (arch_integer_type (gdbarch, 64, 1, "u64"));
 
     unsigned int length = 8 * TYPE_LENGTH (builtin->builtin_data_ptr);
-    types[rust_primitive_isize] = arch_integer_type (gdbarch, length, 0, "isize");
-    types[rust_primitive_usize] = arch_integer_type (gdbarch, length, 1, "usize");
-
-    types[rust_primitive_f32] = arch_float_type (gdbarch, 32, "f32",
-						 floatformats_ieee_single);
-    types[rust_primitive_f64] = arch_float_type (gdbarch, 64, "f64",
-						 floatformats_ieee_double);
+    add (arch_integer_type (gdbarch, length, 0, "isize"));
+    struct type *usize_type
+      = add (arch_integer_type (gdbarch, length, 1, "usize"));
 
-    types[rust_primitive_unit] = arch_integer_type (gdbarch, 0, 1, "()");
+    add (arch_float_type (gdbarch, 32, "f32", floatformats_ieee_single));
+    add (arch_float_type (gdbarch, 64, "f64", floatformats_ieee_double));
+    add (arch_integer_type (gdbarch, 0, 1, "()"));
 
-    struct type *tem = make_cv_type (1, 0, types[rust_primitive_u8], NULL);
-    types[rust_primitive_str] = rust_slice_type ("&str", tem,
-						 types[rust_primitive_usize]);
+    struct type *tem = make_cv_type (1, 0, u8_type, NULL);
+    add (rust_slice_type ("&str", tem, usize_type));
 
-    lai->primitive_type_vector = types;
-    lai->bool_type_default = types[rust_primitive_bool];
-    lai->string_char_type = types[rust_primitive_u8];
+    lai->set_bool_type (bool_type);
+    lai->set_string_char_type (u8_type);
   }
 
   /* See language.h.  */