From 6b62451ad08056f0ba02e192ec34ef67c4294ef4 Mon Sep 17 00:00:00 2001 From: Lancelot Six Date: Thu, 14 Sep 2023 11:13:24 +0000 Subject: gdb: Use C++17's std::make_unique instead of gdb::make_unique gdb::make_unique is a wrapper around std::make_unique when compiled with C++17. Now that C++17 is required, use std::make_unique directly in the codebase, and remove gdb::make_unique. Change-Id: I80b615e46e4b7c097f09d78e579a9bdce00254ab Approved-By: Tom Tromey Approved-By: Pedro Alves (); + auto map = std::make_unique (); SELF_CHECK (map != nullptr); /* Check initial state. */ diff --git a/gdb/break-catch-load.c b/gdb/break-catch-load.c index 02a98b5..dbf70d8 100644 --- a/gdb/break-catch-load.c +++ b/gdb/break-catch-load.c @@ -230,7 +230,7 @@ add_solib_catchpoint (const char *arg, bool is_load, bool is_temp, bool enabled) if (*arg == '\0') arg = nullptr; - auto c = gdb::make_unique (gdbarch, is_temp, nullptr, + auto c = std::make_unique (gdbarch, is_temp, nullptr, is_load, arg); c->enable_state = enabled ? bp_enabled : bp_disabled; diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c index 53b7285..3a3e4d2 100644 --- a/gdb/compile/compile-c-support.c +++ b/gdb/compile/compile-c-support.c @@ -118,7 +118,7 @@ get_compile_context (const char *fe_libcc, const char *fe_context, error (_("The loaded version of GCC does not support the required version " "of the API.")); - return gdb::make_unique (context); + return std::make_unique (context); } /* A C-language implementation of get_compile_context. */ diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y index 324166a..e6c8c4c 100644 --- a/gdb/cp-name-parser.y +++ b/gdb/cp-name-parser.y @@ -2038,7 +2038,7 @@ cp_demangled_name_to_comp (const char *demangled_name, state.demangle_info = allocate_info (); - auto result = gdb::make_unique (); + auto result = std::make_unique (); result->info = state.demangle_info; if (yyparse (&state)) diff --git a/gdb/cp-support.c b/gdb/cp-support.c index e02e859..834c477 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -675,7 +675,7 @@ mangled_name_to_comp (const char *mangled_name, int options, options, memory); if (ret) { - auto info = gdb::make_unique (); + auto info = std::make_unique (); info->tree = ret; *demangled_p = NULL; return info; diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c index abc8d61..d72dd0a 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -2126,7 +2126,7 @@ dwarf2_build_frame_info (struct objfile *objfile) struct gdbarch *gdbarch = objfile->arch (); /* Build a minimal decoding of the DWARF2 compilation unit. */ - auto unit = gdb::make_unique (objfile); + auto unit = std::make_unique (objfile); if (objfile->separate_debug_objfile_backlink == NULL) { diff --git a/gdb/dwarf2/read-debug-names.c b/gdb/dwarf2/read-debug-names.c index c1b62b3..78e0df2 100644 --- a/gdb/dwarf2/read-debug-names.c +++ b/gdb/dwarf2/read-debug-names.c @@ -464,7 +464,7 @@ create_cus_from_debug_names (dwarf2_per_bfd *per_bfd, bool dwarf2_read_debug_names (dwarf2_per_objfile *per_objfile) { - auto map = gdb::make_unique (); + auto map = std::make_unique (); mapped_debug_names dwz_map; struct objfile *objfile = per_objfile->objfile; dwarf2_per_bfd *per_bfd = per_objfile->per_bfd; diff --git a/gdb/dwarf2/read-gdb-index.c b/gdb/dwarf2/read-gdb-index.c index e789e9c..064a9f1 100644 --- a/gdb/dwarf2/read-gdb-index.c +++ b/gdb/dwarf2/read-gdb-index.c @@ -828,7 +828,7 @@ dwarf2_read_gdb_index if (main_index_contents.empty ()) return 0; - auto map = gdb::make_unique (); + auto map = std::make_unique (); if (!read_gdb_index_from_buffer (objfile_name (objfile), use_deprecated_index_sections, main_index_contents, map.get (), &cu_list, diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index e8ff4d8..2a7fd8f 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -4372,7 +4372,7 @@ allocate_type_unit_groups_table () static std::unique_ptr create_type_unit_group (struct dwarf2_cu *cu, sect_offset line_offset_struct) { - auto tu_group = gdb::make_unique (); + auto tu_group = std::make_unique (); tu_group->hash.dwo_unit = cu->dwo_unit; tu_group->hash.line_sect_off = line_offset_struct; diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 56a4c5e..b72821f 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -303,7 +303,7 @@ gdb_bfd_open_from_target_memory (CORE_ADDR addr, ULONGEST size, const char *target) { std::unique_ptr buffer - = gdb::make_unique (addr, size); + = std::make_unique (addr, size); return gdb_bfd_openr_iovec (buffer->filename (), target, [&] (bfd *nbfd) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 7011fdd..e424077 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -5833,7 +5833,7 @@ static const struct registry::key void allocate_fixed_point_type_info (struct type *type) { - auto up = gdb::make_unique (); + auto up = std::make_unique (); fixed_point_type_info *info; if (type->is_objfile_owned ()) diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index abcd0d3..14ed2a1 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1932,7 +1932,7 @@ mi_execute_command (const char *cmd, int from_tty) = gdb::checked_static_cast (command_interp ()); try { - command = gdb::make_unique (cmd, &token); + command = std::make_unique (cmd, &token); } catch (const gdb_exception &exception) { diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index bbd2128..0bc13f9 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -340,13 +340,13 @@ std::unique_ptr mi_out_new (const char *mi_version) { if (streq (mi_version, INTERP_MI4) || streq (mi_version, INTERP_MI)) - return gdb::make_unique (4); + return std::make_unique (4); if (streq (mi_version, INTERP_MI3)) - return gdb::make_unique (3); + return std::make_unique (3); if (streq (mi_version, INTERP_MI2)) - return gdb::make_unique (2); + return std::make_unique (2); return nullptr; } diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c index 3c217da..c0cebbb 100644 --- a/gdb/nat/linux-btrace.c +++ b/gdb/nat/linux-btrace.c @@ -468,7 +468,7 @@ linux_enable_bts (ptid_t ptid, const struct btrace_config_bts *conf) error (_("BTS support has been disabled for the target cpu.")); std::unique_ptr tinfo - { gdb::make_unique (ptid) }; + { std::make_unique (ptid) }; tinfo->conf.format = BTRACE_FORMAT_BTS; @@ -617,7 +617,7 @@ linux_enable_pt (ptid_t ptid, const struct btrace_config_pt *conf) pid = ptid.pid (); std::unique_ptr tinfo - { gdb::make_unique (ptid) }; + { std::make_unique (ptid) }; tinfo->conf.format = BTRACE_FORMAT_PT; diff --git a/gdb/python/py-mi.c b/gdb/python/py-mi.c index a7b4f4f..aaa225d 100644 --- a/gdb/python/py-mi.c +++ b/gdb/python/py-mi.c @@ -290,7 +290,7 @@ gdbpy_execute_mi_command (PyObject *self, PyObject *args, PyObject *kw) try { scoped_restore save_uiout = make_scoped_restore (¤t_uiout, &uiout); - auto parser = gdb::make_unique (std::move (mi_command), + auto parser = std::make_unique (std::move (mi_command), std::move (arg_strings)); mi_execute_command (parser.get ()); } diff --git a/gdb/python/py-varobj.c b/gdb/python/py-varobj.c index 98603ce..3401cf2 100644 --- a/gdb/python/py-varobj.c +++ b/gdb/python/py-varobj.c @@ -170,5 +170,5 @@ py_varobj_get_iterator (struct varobj *var, PyObject *printer, error (_("Could not get children iterator")); } - return gdb::make_unique (var, std::move (iter), opts); + return std::make_unique (var, std::move (iter), opts); } diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c index c8fa865..0fc3a15 100644 --- a/gdb/solib-aix.c +++ b/gdb/solib-aix.c @@ -484,7 +484,7 @@ solib_aix_current_sos () new_solib->so_original_name = so_name; new_solib->so_name = so_name; - new_solib->lm_info = gdb::make_unique (info); + new_solib->lm_info = std::make_unique (info); /* Add it to the list. */ sos.push_back (*new_solib); diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c index c18791c..4819afe 100644 --- a/gdb/solib-darwin.c +++ b/gdb/solib-darwin.c @@ -274,7 +274,7 @@ darwin_current_sos () /* Create and fill the new struct shobj element. */ shobj *newobj = new shobj; - auto li = gdb::make_unique (); + auto li = std::make_unique (); newobj->so_name = file_path.get (); newobj->so_original_name = newobj->so_name; diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c index 65bb625..ef56146 100644 --- a/gdb/solib-dsbt.c +++ b/gdb/solib-dsbt.c @@ -594,7 +594,7 @@ dsbt_current_sos (void) } shobj *sop = new shobj; - auto li = gdb::make_unique (); + auto li = std::make_unique (); li->map = loadmap; /* Fetch the name. */ addr = extract_unsigned_integer (lm_buf.l_name, diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c index 0897bce..7ca2898 100644 --- a/gdb/solib-frv.c +++ b/gdb/solib-frv.c @@ -377,7 +377,7 @@ frv_current_sos () } shobj *sop = new shobj; - auto li = gdb::make_unique (); + auto li = std::make_unique (); li->map = loadmap; li->got_value = got_addr; li->lm_addr = lm_addr; diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c index 3a971b3..cf56a81 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -212,7 +212,7 @@ so_list_from_rocm_sos (const std::vector &sos) for (const rocm_so &so : sos) { struct shobj *newobj = new struct shobj; - newobj->lm_info = gdb::make_unique (*so.lm_info); + newobj->lm_info = std::make_unique (*so.lm_info); newobj->so_name = so.name; newobj->so_original_name = so.unique_name; @@ -725,7 +725,7 @@ rocm_update_solib_list () gdb::unique_xmalloc_ptr uri_bytes_holder (uri_bytes); - lm_info_svr4_up li = gdb::make_unique (); + lm_info_svr4_up li = std::make_unique (); li->l_addr = l_addr; /* Generate a unique name so that code objects with the same URI but diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 8a5ad59..5882a4e 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -213,7 +213,7 @@ lm_info_read (CORE_ADDR lm_addr) type *ptr_type = builtin_type (current_inferior ()->arch ())->builtin_data_ptr; - lm_info = gdb::make_unique (); + lm_info = std::make_unique (); lm_info->lm_addr = lm_addr; lm_info->l_addr_inferior = extract_typed_address (&lm[lmo->l_addr_offset], @@ -1001,7 +1001,7 @@ so_list_from_svr4_sos (const std::vector &sos) newobj->so_name = so.name; newobj->so_original_name = so.name; - newobj->lm_info = gdb::make_unique (*so.lm_info); + newobj->lm_info = std::make_unique (*so.lm_info); dst.push_back (*newobj); } @@ -1032,7 +1032,7 @@ library_list_start_library (struct gdb_xml_parser *parser, ULONGEST *l_ldp = (ULONGEST *) xml_find_attribute (attributes, "l_ld")->value.get (); - lm_info_svr4_up li = gdb::make_unique (); + lm_info_svr4_up li = std::make_unique (); li->lm_addr = *lmp; li->l_addr_inferior = *l_addrp; li->l_ld = *l_ldp; @@ -1190,7 +1190,7 @@ svr4_default_sos (svr4_info *info) return {}; shobj *newobj = new shobj; - auto li = gdb::make_unique (); + auto li = std::make_unique (); /* Nothing will ever check the other fields if we set l_addr_p. */ li->l_addr = li->l_addr_inferior = info->debug_loader_offset; diff --git a/gdb/ui-out.c b/gdb/ui-out.c index defa8f9..e8653c6 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -236,7 +236,7 @@ void ui_out_table::append_header (int width, ui_align alignment, internal_error (_("table header must be specified after table_begin and " "before table_body.")); - auto header = gdb::make_unique (m_headers.size () + 1, + auto header = std::make_unique (m_headers.size () + 1, width, alignment, col_name, col_hdr); @@ -328,7 +328,7 @@ ui_out::current_level () const void ui_out::push_level (ui_out_type type) { - auto level = gdb::make_unique (type); + auto level = std::make_unique (type); m_levels.push_back (std::move (level)); } diff --git a/gdb/unittests/parallel-for-selftests.c b/gdb/unittests/parallel-for-selftests.c index 1ad7eaa..63e9512 100644 --- a/gdb/unittests/parallel-for-selftests.c +++ b/gdb/unittests/parallel-for-selftests.c @@ -160,7 +160,7 @@ TEST (int n_threads) { if (start == end) any_empty_tasks = true; - return gdb::make_unique (end - start); + return std::make_unique (end - start); }); SELF_CHECK (!any_empty_tasks); SELF_CHECK (std::all_of (intresults.begin (), @@ -178,7 +178,7 @@ TEST (int n_threads) { if (start == end) any_empty_tasks = true; - return gdb::make_unique (end - start); + return std::make_unique (end - start); }, task_size_one); SELF_CHECK (!any_empty_tasks); diff --git a/gdb/varobj.c b/gdb/varobj.c index a4fcbff..4ea8d0f 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -259,7 +259,7 @@ varobj_create (const char *objname, const char *expression, CORE_ADDR frame, enum varobj_type type) { /* Fill out a varobj structure for the (root) variable being constructed. */ - auto var = gdb::make_unique (new varobj_root); + auto var = std::make_unique (new varobj_root); if (expression != NULL) { -- cgit v1.1