From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v2 14/18] Change current_language to be a macro
Date: Sun, 12 Nov 2023 13:25:51 -0700 [thread overview]
Message-ID: <20231112-t-bg-dwarf-reading-v2-14-70fb170012ba@tromey.com> (raw)
In-Reply-To: <20231112-t-bg-dwarf-reading-v2-0-70fb170012ba@tromey.com>
This changes the 'current_language' global to be a macro that wraps a
function call. This change will let a subsequent patch introduce lazy
language setting.
---
gdb/language.c | 16 ++++++++++++----
gdb/language.h | 7 ++++++-
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/gdb/language.c b/gdb/language.c
index c768971be42..d38e2c04afb 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -79,9 +79,17 @@ enum case_sensitivity case_sensitivity = case_sensitive_on;
/* The current language and language_mode (see language.h). */
-const struct language_defn *current_language = nullptr;
+static const struct language_defn *global_current_language;
enum language_mode language_mode = language_mode_auto;
+/* See language.h. */
+
+const struct language_defn *
+get_current_language ()
+{
+ return global_current_language;
+}
+
/* The language that the user expects to be typing in (the language
of main(), or the last language we notified them about, or C). */
@@ -177,9 +185,9 @@ set_language (const char *language)
/* Found it! Go into manual mode, and use this language. */
language_mode = language_mode_manual;
- current_language = lang;
+ global_current_language = lang;
set_range_case ();
- expected_language = current_language;
+ expected_language = lang;
return;
}
@@ -364,7 +372,7 @@ set_range_case (void)
void
set_language (enum language lang)
{
- current_language = language_def (lang);
+ global_current_language = language_def (lang);
set_range_case ();
}
\f
diff --git a/gdb/language.h b/gdb/language.h
index 6ee8f6160e1..6ff6f5eb95f 100644
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -680,6 +680,11 @@ struct language_defn
(const lookup_name_info &lookup_name) const;
};
+/* Return the current language. Normally code just uses the
+ 'current_language' macro. */
+
+extern const struct language_defn *get_current_language ();
+
/* Pointer to the language_defn for our current language. This pointer
always points to *some* valid struct; it can be used without checking
it for validity.
@@ -696,7 +701,7 @@ struct language_defn
the language of symbol files (e.g. detecting when ".c" files are
C++), it should be a separate setting from the current_language. */
-extern const struct language_defn *current_language;
+#define current_language (get_current_language ())
/* Pointer to the language_defn expected by the user, e.g. the language
of main(), or the language we last mentioned in a message, or C. */
--
2.41.0
next prev parent reply other threads:[~2023-11-12 20:25 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-12 20:25 [PATCH v2 00/18] Index DWARf in the background Tom Tromey
2023-11-12 20:25 ` [PATCH v2 01/18] Don't use objfile::intern in DWO code Tom Tromey
2023-11-12 20:25 ` [PATCH v2 02/18] Pre-read DWZ section data Tom Tromey
2023-11-12 20:25 ` [PATCH v2 03/18] Add a couple of bfd_cache_close calls Tom Tromey
2023-11-12 20:25 ` [PATCH v2 04/18] Add thread-safety to gdb's BFD wrappers Tom Tromey
2023-11-12 20:25 ` [PATCH v2 05/18] Refactor complaint thread-safety approach Tom Tromey
2023-11-12 20:25 ` [PATCH v2 06/18] Add quick_symbol_functions::compute_main_name Tom Tromey
2023-11-12 20:25 ` [PATCH v2 07/18] Add gdb::task_group Tom Tromey
2023-11-12 20:25 ` [PATCH v2 08/18] Move cooked_index_storage to cooked-index.h Tom Tromey
2023-11-12 20:25 ` [PATCH v2 09/18] Add "maint set dwarf synchronous" Tom Tromey
2023-11-13 13:43 ` Eli Zaretskii
2023-11-12 20:25 ` [PATCH v2 10/18] Change how cooked index waits for threads Tom Tromey
2023-11-12 20:25 ` [PATCH v2 11/18] Do more DWARF reading in the background Tom Tromey
2023-11-13 7:15 ` Tom de Vries
2023-11-13 17:56 ` John Baldwin
2023-11-13 19:39 ` Tom de Vries
2023-11-14 17:31 ` John Baldwin
2023-11-21 14:24 ` Tom Tromey
2023-11-12 20:25 ` [PATCH v2 12/18] Simplify the public DWARF API Tom Tromey
2023-11-12 20:25 ` [PATCH v2 13/18] Remove two quick_symbol_functions methods Tom Tromey
2023-11-12 20:25 ` Tom Tromey [this message]
2023-11-12 20:25 ` [PATCH v2 15/18] Lazy language setting Tom Tromey
2023-11-12 20:25 ` [PATCH v2 16/18] Optimize lookup_minimal_symbol_text Tom Tromey
2023-11-12 20:25 ` [PATCH v2 17/18] Avoid language-based lookups in startup path Tom Tromey
2023-11-12 20:25 ` [PATCH v2 18/18] Back out some parallel_for_each features Tom Tromey
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=20231112-t-bg-dwarf-reading-v2-14-70fb170012ba@tromey.com \
--to=tom@tromey.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).