From: Tom Tromey <tom@tromey.com>
Date: Mon, 8 Mar 2021 14:27:57 +0000 (-0700)
Subject: Inline expr_builder methods
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce284361a2b8c928df94acdb9afd005242140bb1;p=binutils-gdb.git

Inline expr_builder methods

This inlines the expr_builder constructor and release method.  These
are straightforward, so this seemed simpler.

gdb/ChangeLog
2021-03-08  Tom Tromey  <tom@tromey.com>

	* parser-defs.h (struct expr_builder) <expr_builder>: Inline.
	<release>: Inline.
	* parse.c (expr_builder::expr_builder, expr_builder::release):
	Remove.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e2f6368af4d..212f61da485 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+	* parser-defs.h (struct expr_builder) <expr_builder>: Inline.
+	<release>: Inline.
+	* parse.c (expr_builder::expr_builder, expr_builder::release):
+	Remove.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
 	* parse.c (expression::expression, expression::~expression):
diff --git a/gdb/parse.c b/gdb/parse.c
index d068c94dfcd..056dee18d07 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -91,20 +91,6 @@ innermost_block_tracker::update (const struct block *b,
 
 
 
-/* See definition in parser-defs.h.  */
-
-expr_builder::expr_builder (const struct language_defn *lang,
-			    struct gdbarch *gdbarch)
-  : expout (new expression (lang, gdbarch))
-{
-}
-
-expression_up
-expr_builder::release ()
-{
-  return std::move (expout);
-}
-
 /* Return the type of MSYMBOL, a minimal symbol of OBJFILE.  If
    ADDRESS_P is not NULL, set it to the MSYMBOL's resolved
    address.  */
diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h
index 3e81e0b8b3c..22768215a24 100644
--- a/gdb/parser-defs.h
+++ b/gdb/parser-defs.h
@@ -42,13 +42,19 @@ struct expr_builder
      And GDBARCH is the gdbarch to use during parsing.  */
 
   expr_builder (const struct language_defn *lang,
-		struct gdbarch *gdbarch);
+		struct gdbarch *gdbarch)
+    : expout (new expression (lang, gdbarch))
+  {
+  }
 
   DISABLE_COPY_AND_ASSIGN (expr_builder);
 
   /* Resize the allocated expression to the correct size, and return
      it as an expression_up -- passing ownership to the caller.  */
-  ATTRIBUTE_UNUSED_RESULT expression_up release ();
+  ATTRIBUTE_UNUSED_RESULT expression_up release ()
+  {
+    return std::move (expout);
+  }
 
   /* Return the gdbarch that was passed to the constructor.  */