aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2017-09-21 00:34:41 +0100
committerPedro Alves <palves@redhat.com>2017-09-21 00:34:41 +0100
commitc83833f49353e1fe7fa727291210be751161ade1 (patch)
tree1f970e1e52f2ade2132135fa24846826d34e460e
parentca464aac1b0a444f7debb8fc1e5e8b3f30602a35 (diff)
downloadgdb-c83833f49353e1fe7fa727291210be751161ade1.zip
gdb-c83833f49353e1fe7fa727291210be751161ade1.tar.gz
gdb-c83833f49353e1fe7fa727291210be751161ade1.tar.bz2
eval.c:evaluate_subexp_standard: Use RAII to avoid leaks
While working on the no-debug-info debugging improvements series, I noticed these bare xfree calls, which lead to leaks if evaluate_subexp_standard throws. Fix that by reworking make_params as a RAII class. Ends up eliminating a couple heap allocations too. gdb/ChangeLog: 2017-09-20 Pedro Alves <palves@redhat.com> * eval.c (make_params): Delete, refactored as ... (class fake_method): ... this new type's ctor. (fake_method::~fake_method): New. (evaluate_subexp_standard): Use 'fake_method'.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/eval.c42
2 files changed, 35 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 89a6c29..4de6da2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-20 Pedro Alves <palves@redhat.com>
+
+ * eval.c (make_params): Delete, refactored as ...
+ (class fake_method): ... this new type's ctor.
+ (fake_method::~fake_method): New.
+ (evaluate_subexp_standard): Use 'fake_method'.
+
2017-09-20 Tom Tromey <tom@tromey.com>
* windows-nat.c (get_windows_debug_event, windows_wait)
diff --git a/gdb/eval.c b/gdb/eval.c
index 24f32f8..2587f77 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -642,18 +642,33 @@ ptrmath_type_p (const struct language_defn *lang, struct type *type)
}
}
-/* Constructs a fake method with the given parameter types. This
- function is used by the parser to construct an "expected" type for
+/* Represents a fake method with the given parameter types. This is
+ used by the parser to construct a temporary "expected" type for
method overload resolution. FLAGS is used as instance flags of the
new type, in order to be able to make the new type represent a
const/volatile overload. */
-static struct type *
-make_params (type_instance_flags flags,
- int num_types, struct type **param_types)
+class fake_method
{
- struct type *type = XCNEW (struct type);
- TYPE_MAIN_TYPE (type) = XCNEW (struct main_type);
+public:
+ fake_method (type_instance_flags flags,
+ int num_types, struct type **param_types);
+ ~fake_method ();
+
+ /* The constructed type. */
+ struct type *type () { return &m_type; }
+
+private:
+ struct type m_type {};
+ main_type m_main_type {};
+};
+
+fake_method::fake_method (type_instance_flags flags,
+ int num_types, struct type **param_types)
+{
+ struct type *type = &m_type;
+
+ TYPE_MAIN_TYPE (type) = &m_main_type;
TYPE_LENGTH (type) = 1;
TYPE_CODE (type) = TYPE_CODE_METHOD;
TYPE_CHAIN (type) = type;
@@ -681,8 +696,11 @@ make_params (type_instance_flags flags,
while (num_types-- > 0)
TYPE_FIELD_TYPE (type, num_types) = param_types[num_types];
+}
- return type;
+fake_method::~fake_method ()
+{
+ xfree (TYPE_FIELDS (&m_type));
}
/* Helper for evaluating an OP_VAR_VALUE. */
@@ -2076,13 +2094,9 @@ evaluate_subexp_standard (struct type *expect_type,
for (ix = 0; ix < nargs; ++ix)
arg_types[ix] = exp->elts[pc + 2 + ix + 1].type;
- expect_type = make_params (flags, nargs, arg_types);
+ fake_method expect_type (flags, nargs, arg_types);
*(pos) += 4 + nargs;
- arg1 = evaluate_subexp_standard (expect_type, exp, pos, noside);
- xfree (TYPE_FIELDS (expect_type));
- xfree (TYPE_MAIN_TYPE (expect_type));
- xfree (expect_type);
- return arg1;
+ return evaluate_subexp_standard (expect_type.type (), exp, pos, noside);
}
case BINOP_CONCAT: