From 4e9158ca45ffc4e15c8c57a0df9f99ab49a35c0e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lancelot.six@amd.com>
Date: Thu, 19 Oct 2023 09:29:39 +0100
Subject: [PATCH] gdb/interp: Make interp::interp_ui_out const

The interp::interp_ui_out can be declared const.  Make this change as it
will be used in a following patch.

Change-Id: I11844d36f44d369400049f916db94aca9f43be51
---
 gdb/cli/cli-interp.c | 4 ++--
 gdb/interps.h        | 2 +-
 gdb/mi/mi-interp.c   | 2 +-
 gdb/mi/mi-interp.h   | 2 +-
 gdb/python/py-dap.c  | 2 +-
 gdb/tui/tui-interp.c | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 829948b4993..21c78fd98a9 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -50,7 +50,7 @@ class cli_interp final : public cli_interp_base
   void resume () override;
   void suspend () override;
   void exec (const char *command_str) override;
-  ui_out *interp_ui_out () override;
+  ui_out *interp_ui_out () const override;
 
 private:
 
@@ -255,7 +255,7 @@ cli_interp_base::supports_command_editing ()
 }
 
 ui_out *
-cli_interp::interp_ui_out ()
+cli_interp::interp_ui_out () const
 {
   return m_cli_uiout.get ();
 }
diff --git a/gdb/interps.h b/gdb/interps.h
index 287df2c8c81..a3cbf32aa12 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -65,7 +65,7 @@ class interp : public intrusive_list_node<interp>
      interpreter.  It can be a formatter for stdout, as is the case
      for the console & mi outputs, or it might be a result
      formatter.  */
-  virtual ui_out *interp_ui_out () = 0;
+  virtual ui_out *interp_ui_out () const = 0;
 
   /* Provides a hook for interpreters to do any additional
      setup/cleanup that they might need when logging is enabled or
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 0d3c8235c2c..70075eed16b 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -875,7 +875,7 @@ mi_interp::on_user_selected_context_changed (user_selected_what selection)
 }
 
 ui_out *
-mi_interp::interp_ui_out ()
+mi_interp::interp_ui_out () const
 {
   return this->mi_uiout;
 }
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index f9af61f0a57..ff3c439f1e3 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -37,7 +37,7 @@ class mi_interp final : public interp
   void resume () override;
   void suspend () override;
   void exec (const char *command_str) override;
-  ui_out *interp_ui_out () override;
+  ui_out *interp_ui_out () const override;
   void set_logging (ui_file_up logfile, bool logging_redirect,
 		    bool debug_redirect) override;
   void pre_command_loop () override;
diff --git a/gdb/python/py-dap.c b/gdb/python/py-dap.c
index 3444eccb6fb..7a78e54571f 100644
--- a/gdb/python/py-dap.c
+++ b/gdb/python/py-dap.c
@@ -56,7 +56,7 @@ class dap_interp final : public interp
     /* Just ignore it.  */
   }
 
-  ui_out *interp_ui_out () override
+  ui_out *interp_ui_out () const override
   {
     return m_ui_out.get ();
   }
diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c
index 299cc4caea0..a88162c08e1 100644
--- a/gdb/tui/tui-interp.c
+++ b/gdb/tui/tui-interp.c
@@ -50,7 +50,7 @@ class tui_interp final : public cli_interp_base
   void resume () override;
   void suspend () override;
   void exec (const char *command_str) override;
-  ui_out *interp_ui_out () override;
+  ui_out *interp_ui_out () const override;
 };
 
 /* Cleanup the tui before exiting.  */
@@ -141,7 +141,7 @@ tui_interp::suspend ()
 }
 
 ui_out *
-tui_interp::interp_ui_out ()
+tui_interp::interp_ui_out () const
 {
   if (tui_active)
     return tui_out;

-- 
2.34.1