From: "Ulrich Weigand" <uweigand@de.ibm.com>
To: gdb-patches@sourceware.org, brobecker@adacore.com
Subject: [rfc] Ada simplification: ada_find_any_type
Date: Thu, 14 May 2009 11:38:00 -0000 [thread overview]
Message-ID: <200905141138.n4EBcT3v005484@d12av02.megacenter.de.ibm.com> (raw)
Hello,
this is the last of the Ada patches. A recent change introduced a use of
current_gdbarch into ada_find_any_type, which is somewhat hard to eliminate.
However, it seems to me that for all but one callers of ada_find_any_type,
the check for primitive types isn't really necessary, as they are always
passed Ada-specific types that can never be primitive types.
The one exception is to_fixed_range_type, which indeed should check for
primitive types. The following patch therefore moves the check into this
routine. While this still used current_gdbarch, that instance turns out
to be more straightforward to eliminate here than it would have been in
the generic ada_find_any_type routine ...
Joel, would this be OK?
Bye,
Ulrich
ChangeLog:
* ada-lang.c (ada_find_any_type): Move check for primitive types ...
(to_fixed_range_type): ... to here.
Index: gdb-head/gdb/ada-lang.c
===================================================================
--- gdb-head.orig/gdb/ada-lang.c
+++ gdb-head/gdb/ada-lang.c
@@ -6487,16 +6487,11 @@ struct type *
ada_find_any_type (const char *name)
{
struct symbol *sym = ada_find_any_symbol (name);
- struct type *type = NULL;
if (sym != NULL)
- type = SYMBOL_TYPE (sym);
+ return SYMBOL_TYPE (sym);
- if (type == NULL)
- type = language_lookup_primitive_type_by_name
- (language_def (language_ada), current_gdbarch, name);
-
- return type;
+ return NULL;
}
/* Given NAME and an associated BLOCK, search all symbols for
@@ -9451,6 +9446,11 @@ to_fixed_range_type (char *name, struct
struct type *base_type;
char *subtype_info;
+ /* Also search primitive types if type symbol could not be found. */
+ if (raw_type == NULL)
+ raw_type = language_lookup_primitive_type_by_name
+ (language_def (language_ada), current_gdbarch, name);
+
if (raw_type == NULL)
base_type = builtin_type_int32;
else if (TYPE_CODE (raw_type) == TYPE_CODE_RANGE)
--
Dr. Ulrich Weigand
GNU Toolchain for Linux on System z and Cell BE
Ulrich.Weigand@de.ibm.com
next reply other threads:[~2009-05-14 11:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-14 11:38 Ulrich Weigand [this message]
2009-05-15 15:14 ` Joel Brobecker
2009-05-18 14:01 ` Ulrich Weigand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200905141138.n4EBcT3v005484@d12av02.megacenter.de.ibm.com \
--to=uweigand@de.ibm.com \
--cc=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox