From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugzilla@gcc.gnu.org>
Received: by sourceware.org (Postfix, from userid 48)
	id 23F673858C50; Mon, 17 Jun 2024 20:04:14 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23F673858C50
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1718654654;
	bh=Yd81z2nvJ//mHRs2rbS7LNnU57ka80JPljznHmZBVb8=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=yRnD8sl7w9CXc424w6E/dUmXfmSb0roomHhuHO2OZ1uk+eP6CA7Lji99J8LsH1Wcw
	 kq0KQicuycU8Y11sxO2due+6I3PIZ7fHzVt2mQ9wh4DXTDgek0PSG/fk9H9gshMteN
	 rTNBJdzbZfJMJgT8DSLLzo5Zt1QBdIGuAlQJZFYA=
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug driver/115440] unrecognized command-line option '--c++17'; did
 you mean '--stdc++17'?
Date: Mon, 17 Jun 2024 20:04:12 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: driver
X-Bugzilla-Version: unknown
X-Bugzilla-Keywords: diagnostic
X-Bugzilla-Severity: normal
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: NEW
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-115440-4-u90uTTYWfV@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-115440-4@http.gcc.gnu.org/bugzilla/>
References: <bug-115440-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
List-Id: <gcc-bugs.sourceware.org>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D115440

--- Comment #4 from GCC Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jakub Jelinek <jakub@gcc.gnu.org>:

https://gcc.gnu.org/g:96db57948b50f45235ae4af3b46db66cae7ea859

commit r15-1384-g96db57948b50f45235ae4af3b46db66cae7ea859
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Mon Jun 17 22:02:46 2024 +0200

    diagnostics: Fix add_misspelling_candidates [PR115440]

    The option_map array for most entries contains just non-NULL opt0
        { "-Wno-", NULL, "-W", false, true },
        { "-fno-", NULL, "-f", false, true },
        { "-gno-", NULL, "-g", false, true },
        { "-mno-", NULL, "-m", false, true },
        { "--debug=3D", NULL, "-g", false, false },
        { "--machine-", NULL, "-m", true, false },
        { "--machine-no-", NULL, "-m", false, true },
        { "--machine=3D", NULL, "-m", false, false },
        { "--machine=3Dno-", NULL, "-m", false, true },
        { "--machine", "", "-m", false, false },
        { "--machine", "no-", "-m", false, true },
        { "--optimize=3D", NULL, "-O", false, false },
        { "--std=3D", NULL, "-std=3D", false, false },
        { "--std", "", "-std=3D", false, false },
        { "--warn-", NULL, "-W", true, false },
        { "--warn-no-", NULL, "-W", false, true },
        { "--", NULL, "-f", true, false },
        { "--no-", NULL, "-f", false, true }
    and so add_misspelling_candidates works correctly for it, but 3 out of
    these,
        { "--machine", "", "-m", false, false },
        { "--machine", "no-", "-m", false, true },
    and
        { "--std", "", "-std=3D", false, false },
    use non-NULL opt1.  That says that
    --machine foo
    should map to
    -mfoo
    and
    --machine no-foo
    should map to
    -mno-foo
    and
    --std c++17
    should map to
    -std=3Dc++17
    add_misspelling_canidates was not handling this, so it hapilly
    registered say
    --stdc++17
    or
    --machineavx512
    (twice) as spelling alternatives, when those options aren't recognized.
    Instead we support
    --std c++17
    or
    --machine avx512
    --machine no-avx512

    The following patch fixes that.  On this particular testcase, we no lon=
ger
    suggest anything, even when among the suggestion is say that
    --std c++17
    or
    -std=3Dc++17
    etc.

    2024-06-17  Jakub Jelinek  <jakub@redhat.com>

            PR driver/115440
            * opts-common.cc (add_misspelling_candidates): If opt1 is non-N=
ULL,
            add a space and opt1 to the alternative suggestion text.

            * g++.dg/cpp1z/pr115440.C: New test.=