diff options
author | Tom Tromey <tom@tromey.com> | 2022-01-14 09:06:11 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2022-01-18 10:01:20 -0700 |
commit | 5947982f1dadfa72a6913f25cc4f56e137c7217e (patch) | |
tree | 10300e6cbb942bfa03a00af19c99027edea507e8 /gdb/location.c | |
parent | 85e428a69f5b34770ec4f76168d3c8dbb3a454bf (diff) | |
download | gdb-5947982f1dadfa72a6913f25cc4f56e137c7217e.zip gdb-5947982f1dadfa72a6913f25cc4f56e137c7217e.tar.gz gdb-5947982f1dadfa72a6913f25cc4f56e137c7217e.tar.bz2 |
Simplify event_location_probe
event_location_probe currently stores two strings, but really only
needs one. This patch simplifies it and removes some unnecessary
copies as well.
Diffstat (limited to 'gdb/location.c')
-rw-r--r-- | gdb/location.c | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/gdb/location.c b/gdb/location.c index f8369bf..d4dfc3b 100644 --- a/gdb/location.c +++ b/gdb/location.c @@ -71,6 +71,12 @@ protected: { } + event_location (enum event_location_type t, std::string &&str) + : type (t), + as_string (std::move (str)) + { + } + explicit event_location (const event_location *to_clone) : type (to_clone->type), as_string (to_clone->as_string) @@ -85,17 +91,9 @@ protected: /* A probe. */ struct event_location_probe : public event_location { - explicit event_location_probe (const char *probe) - : event_location (PROBE_LOCATION), - addr_string (probe == nullptr - ? nullptr - : xstrdup (probe)) - { - } - - ~event_location_probe () + explicit event_location_probe (std::string &&probe) + : event_location (PROBE_LOCATION, std::move (probe)) { - xfree (addr_string); } event_location_up clone () const override @@ -105,24 +103,19 @@ struct event_location_probe : public event_location bool empty_p () const override { - return addr_string == nullptr; + return false; } - char *addr_string; - protected: explicit event_location_probe (const event_location_probe *to_clone) - : event_location (to_clone), - addr_string (to_clone->addr_string == nullptr - ? nullptr - : xstrdup (to_clone->addr_string)) + : event_location (to_clone) { } std::string compute_string () const override { - return addr_string; + return std::move (as_string); } }; @@ -357,9 +350,9 @@ get_address_string_location (const struct event_location *location) /* See description in location.h. */ event_location_up -new_probe_location (const char *probe) +new_probe_location (std::string &&probe) { - return event_location_up (new event_location_probe (probe)); + return event_location_up (new event_location_probe (std::move (probe))); } /* See description in location.h. */ @@ -368,7 +361,7 @@ const char * get_probe_location (const struct event_location *location) { gdb_assert (location->type == PROBE_LOCATION); - return ((event_location_probe *) location)->addr_string; + return location->to_string (); } /* See description in location.h. */ |