diff options
Diffstat (limited to 'gdb/d-lang.c')
| -rw-r--r-- | gdb/d-lang.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gdb/d-lang.c b/gdb/d-lang.c index ce6dc05841..d9591997c8 100644 --- a/gdb/d-lang.c +++ b/gdb/d-lang.c @@ -188,11 +188,10 @@ static d_language d_language_defn; /* Build all D language types for the specified architecture. */ -static void * +static struct builtin_d_type * build_d_types (struct gdbarch *gdbarch) { - struct builtin_d_type *builtin_d_type - = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct builtin_d_type); + struct builtin_d_type *builtin_d_type = new struct builtin_d_type; /* Basic types. */ builtin_d_type->builtin_void @@ -265,19 +264,19 @@ build_d_types (struct gdbarch *gdbarch) return builtin_d_type; } -static struct gdbarch_data *d_type_data; +static const registry<gdbarch>::key<struct builtin_d_type> d_type_data; /* Return the D type table for the specified architecture. */ const struct builtin_d_type * builtin_d_type (struct gdbarch *gdbarch) { - return (const struct builtin_d_type *) gdbarch_data (gdbarch, d_type_data); -} + struct builtin_d_type *result = d_type_data.get (gdbarch); + if (result == nullptr) + { + result = build_d_types (gdbarch); + d_type_data.set (gdbarch, result); + } -void _initialize_d_language (); -void -_initialize_d_language () -{ - d_type_data = gdbarch_data_register_post_init (build_d_types); + return result; } |