From 2a54d2158beeb2833cb3fb4da68e7c55e341159a Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Tue, 16 Jan 2018 14:41:17 -0500 Subject: Fix warning on gdb/compile/compile.c (C++-ify "triplet_rx") This fixes a GCC warning that happens when compiling gdb/compile/compile.c on some GCC versions (e.g., "gcc (GCC) 7.2.1 20180104 (Red Hat 7.2.1-6)"): ../../gdb/compile/compile.c: In function 'void eval_compile_command(command_line*, const char*, compile_i_scope_types, void*)': ../../gdb/compile/compile.c:548:19: warning: 'triplet_rx' may be used uninitialized in this function [-Wmaybe-uninitialized] error_message = compiler->fe->ops->set_arguments_v0 (compiler->fe, triplet_rx, ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ argc, argv); ~~~~~~~~~~~ ../../gdb/compile/compile.c:466:9: note: 'triplet_rx' was declared here char *triplet_rx; ^~~~~~~~~~ It's a simple patch that converts "triplet_rx" from "char *" to "std::string", thus guaranteeing that it will be always initialized. I've regtested this patch and did not find any regressions. OK to apply on both master and 8.1 (after creating a bug for it)? gdb/ChangeLog: 2018-01-17 Sergio Durigan Junior * compile/compile.c (compile_to_object): Convert "triplet_rx" to "std::string". --- gdb/ChangeLog | 5 +++++ gdb/compile/compile.c | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3bb66d163b..91093a5b11 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-01-17 Sergio Durigan Junior + + * compile/compile.c (compile_to_object): Convert "triplet_rx" + to "std::string". + 2018-01-17 Eldar Abusalimov PR gdb/21559 diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c index 2ee75930ac..82e63d895f 100644 --- a/gdb/compile/compile.c +++ b/gdb/compile/compile.c @@ -463,7 +463,7 @@ compile_to_object (struct command_line *cmd, const char *cmd_string, char **argv; int ok; struct gdbarch *gdbarch = get_current_arch (); - char *triplet_rx; + std::string triplet_rx; char *error_message; if (!target_has_execution) @@ -531,11 +531,11 @@ compile_to_object (struct command_line *cmd, const char *cmd_string, const char *arch_rx = gdbarch_gnu_triplet_regexp (gdbarch); /* Allow triplets with or without vendor set. */ - triplet_rx = concat (arch_rx, "(-[^-]*)?-", os_rx, (char *) NULL); - make_cleanup (xfree, triplet_rx); + triplet_rx = std::string (arch_rx) + "(-[^-]*)?-" + os_rx; if (compiler->fe->ops->version >= GCC_FE_VERSION_1) - compiler->fe->ops->set_triplet_regexp (compiler->fe, triplet_rx); + compiler->fe->ops->set_triplet_regexp (compiler->fe, + triplet_rx.c_str ()); } /* Set compiler command-line arguments. */ @@ -545,7 +545,8 @@ compile_to_object (struct command_line *cmd, const char *cmd_string, if (compiler->fe->ops->version >= GCC_FE_VERSION_1) error_message = compiler->fe->ops->set_arguments (compiler->fe, argc, argv); else - error_message = compiler->fe->ops->set_arguments_v0 (compiler->fe, triplet_rx, + error_message = compiler->fe->ops->set_arguments_v0 (compiler->fe, + triplet_rx.c_str (), argc, argv); if (error_message != NULL) { -- cgit v1.2.3