From c26f2453abb778e5b449608bb6fd9719f2a748f2 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Wed, 28 Feb 2007 16:35:49 +0000 Subject: [PATCH] * gdbtypes.c (check_typedef): Do not replace stub type if the resolved type is not defined in the same objfile. --- gdb/ChangeLog | 6 ++++++ gdb/gdbtypes.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 22e31fbd9ca..096d9be57c4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2007-02-28 Jerome Guitton + Joel Brobecker + + * gdbtypes.c (check_typedef): Do not replace stub type if + the resolved type is not defined in the same objfile. + 2007-02-28 Daniel Jacobowitz * top.c (gdb_readline_wrapper_cleanup): Remove invalid assertion. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 5d56de06afe..30b53623e99 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1514,7 +1514,15 @@ check_typedef (struct type *type) } sym = lookup_symbol (name, 0, STRUCT_DOMAIN, 0, (struct symtab **) NULL); if (sym) - make_cv_type (is_const, is_volatile, SYMBOL_TYPE (sym), &type); + { + /* Same as above for opaque types, we can replace the stub + with the complete type only if they are int the same + objfile. */ + if (TYPE_OBJFILE (SYMBOL_TYPE(sym)) == TYPE_OBJFILE (type)) + make_cv_type (is_const, is_volatile, SYMBOL_TYPE (sym), &type); + else + type = SYMBOL_TYPE (sym); + } } if (TYPE_TARGET_STUB (type)) -- 2.30.2