From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 309FD385AC33; Wed, 30 Jun 2021 11:19:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 309FD385AC33 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1928] gcc.c's check_offload_target_name: Fixes to inform hints X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/master X-Git-Oldrev: 0a9d038ec10aa0d109ca965cc435934bfea92d14 X-Git-Newrev: a3ce7d75dd9c0308b8565669f31127436cb2ba9f Message-Id: <20210630111903.309FD385AC33@sourceware.org> Date: Wed, 30 Jun 2021 11:19:03 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2021 11:19:03 -0000 https://gcc.gnu.org/g:a3ce7d75dd9c0308b8565669f31127436cb2ba9f commit r12-1928-ga3ce7d75dd9c0308b8565669f31127436cb2ba9f Author: Tobias Burnus Date: Wed Jun 30 13:17:54 2021 +0200 gcc.c's check_offload_target_name: Fixes to inform hints gcc/ChangeLog: * gcc.c (close_at_file, execute): Replace alloca by XALLOCAVEC. (check_offload_target_name): Fix splitting OFFLOAD_TARGETS into a candidate list; better inform no offload target is configured and fix hint extraction when passed target is not '\0' at [len]. * common.opt (foffload): Add tailing '.'. (foffload-options): Likewise; fix flag name in the help string. Diff: --- gcc/common.opt | 4 ++-- gcc/gcc.c | 42 ++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/gcc/common.opt b/gcc/common.opt index eaee74c580a..2f5ff9f02e9 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -2104,11 +2104,11 @@ Support synchronous non-call exceptions. ; -foffload== is supported for backward compatibility foffload= Driver Joined MissingArgError(targets missing after %qs) --foffload= Specify offloading targets +-foffload= Specify offloading targets. foffload-options= Common Driver Joined MissingArgError(options or targets=options missing after %qs) --foffload== Specify options for the offloading targets +-foffload-options== Specify options for the offloading targets. foffload-abi= Common Joined RejectNegative Enum(offload_abi) Var(flag_offload_abi) Init(OFFLOAD_ABI_UNSET) diff --git a/gcc/gcc.c b/gcc/gcc.c index 9baa7d67c76..f802148e567 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -2242,7 +2242,7 @@ close_at_file (void) if (n_args == 0) return; - char **argv = (char **) alloca (sizeof (char *) * (n_args + 1)); + char **argv = XALLOCAVEC (char *, n_args + 1); char *temp_file = make_at_file (); char *at_argument = concat ("@", temp_file, NULL); FILE *f = fopen (temp_file, "w"); @@ -3251,7 +3251,7 @@ execute (void) n_commands++; /* Get storage for each command. */ - commands = (struct command *) alloca (n_commands * sizeof (struct command)); + commands = XALLOCAVEC (struct command, n_commands); /* Split argbuf into its separate piped processes, and record info about each one. @@ -3430,13 +3430,13 @@ execute (void) struct pex_time *times = NULL; int ret_code = 0; - statuses = (int *) alloca (n_commands * sizeof (int)); + statuses = XALLOCAVEC (int, n_commands); if (!pex_get_status (pex, n_commands, statuses)) fatal_error (input_location, "failed to get exit status: %m"); if (report_times || report_times_to_file) { - times = (struct pex_time *) alloca (n_commands * sizeof (struct pex_time)); + times = XALLOCAVEC (struct pex_time, n_commands); if (!pex_get_times (pex, n_commands, times)) fatal_error (input_location, "failed to get process times: %m"); } @@ -3997,24 +3997,22 @@ check_offload_target_name (const char *target, ptrdiff_t len) { char *s; auto_vec candidates; - char *cand = (char *) alloca (strlen (OFFLOAD_TARGETS) + 1); - c = OFFLOAD_TARGETS; - while (c) - { - n = strchr (c, ','); - if (n == NULL) - n = strchr (c, '\0'); - if (n - c == 0) - break; - strncpy (cand, c, n - c); - cand[n - c] = '\0'; - candidates.safe_push (cand); - c = *n ? n + 1 : NULL; - } - error ("GCC is not configured to support %q.*s as offload target", - (int) len, target); - const char *hint = candidates_list_and_hint (target, s, candidates); - if (hint) + size_t olen = strlen (OFFLOAD_TARGETS) + 1; + char *cand = XALLOCAVEC (char, olen); + memcpy (cand, OFFLOAD_TARGETS, olen); + for (c = strtok (cand, ","); c; c = strtok (NULL, ",")) + candidates.safe_push (c); + + char *target2 = XALLOCAVEC (char, len + 1); + memcpy (target2, target, len); + target2[len] = '\0'; + + error ("GCC is not configured to support %qs as offload target", target2); + + const char *hint = candidates_list_and_hint (target2, s, candidates); + if (candidates.is_empty ()) + inform (UNKNOWN_LOCATION, "no offloading targets configured"); + else if (hint) inform (UNKNOWN_LOCATION, "valid offload targets are: %s; did you mean %qs?", s, hint); else