From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) by sourceware.org (Postfix) with ESMTPS id DD4EA3858D3C for ; Tue, 8 Nov 2022 10:18:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DD4EA3858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=foss.st.com Received: from pps.filterd (m0241204.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2A89gMJ3017280; Tue, 8 Nov 2022 11:18:32 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=OiDf56UUb+u+syGYH/IDSHAKN/PMmf2aD2aBYiZGves=; b=O8LHOVUGcQxI7jLLwo8JzZ0ju/qEiWQFWC6f48rLKlm9vfCB11uRpHTt31MsptpVrlmr fPtTZAc0OCCstsK91LK37rlfMp8mZn506Ehs2heG+Txf5Y3NT2ge16oh21vLLa9wuqT7 JToIlOfyl2W0y9yIN7RVpkX26Hm4mIH7Fkc5zZY1H4F40ruljPOXG7JrxPV2aNZ/P37H 5jlbS5ZErD6fWkVylWyiEP30q9CcdFPJOszqn2QXazLgSMZXN6pCOgPhjwleZH1FaBhN Jfr78NbdHGhU2id393L78DkmlIbJf3J8XUAQY5ADrmOU2tNKpdv01o5+ofds5y4YgmpM iA== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3kq0apy5ux-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Nov 2022 11:18:32 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id B42EF10002A; Tue, 8 Nov 2022 11:18:26 +0100 (CET) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id DF28A216826; Tue, 8 Nov 2022 11:18:26 +0100 (CET) Received: from [10.252.17.51] (10.252.17.51) by SHFDAG1NODE3.st.com (10.75.129.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.32; Tue, 8 Nov 2022 11:18:26 +0100 Message-ID: <67003a2e-3f12-2794-3cd9-4b93650baafc@foss.st.com> Date: Tue, 8 Nov 2022 11:18:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH] c++: Allow module name to be a single letter on Windows Content-Language: en-US To: Nathan Sidwell , CC: References: <20221028091500.2748920-1-torbjorn.svensson@foss.st.com> <6c6abd06-ae1a-059b-a376-db738af5506e@acm.org> <64a79925-652c-60b3-1c19-86c1880e7d0b@foss.st.com> <78f9a5af-fd84-00e3-feb4-6130a7911593@acm.org> From: Torbjorn SVENSSON In-Reply-To: <78f9a5af-fd84-00e3-feb4-6130a7911593@acm.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.252.17.51] X-ClientProxiedBy: SHFCAS1NODE2.st.com (10.75.129.73) To SHFDAG1NODE3.st.com (10.75.129.71) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_11,2022-11-08_01,2022-06-22_01 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi Nathan, On 2022-11-08 00:03, Nathan Sidwell wrote: > On 11/3/22 11:06, Torbjorn SVENSSON wrote: >> >> >> On 2022-11-03 15:17, Nathan Sidwell wrote: >>> On 10/28/22 05:15, Torbjörn SVENSSON wrote: >>>> On Windows, the ':' character is special and when the module name is >>>> a single character, like 'A', then the flatname would be (for >>>> example) 'A:Foo'. On Windows, 'A:Foo' is treated as an absolute >>>> path by the module loader and is likely not found. >>>> >>>> Without this patch, the test case pr98944_c.C fails with: >>>> >>>> In module imported at >>>> /src/gcc/testsuite/g++.dg/modules/pr98944_b.C:7:1, >>>> of module A:Foo, imported at >>>> /src/gcc/testsuite/g++.dg/modules/pr98944_c.C:7: >>>> A:Internals: error: header module expected, module 'A:Internals' found >>>> A:Internals: error: failed to read compiled module: Bad file data >>>> A:Internals: note: compiled module file is 'gcm.cache/A-Internals.gcm' >>>> In module imported at >>>> /src/gcc/testsuite/g++.dg/modules/pr98944_c.C:7:8: >>>> A:Foo: error: failed to read compiled module: Bad import dependency >>>> A:Foo: note: compiled module file is 'gcm.cache/A-Foo.gcm' >>>> A:Foo: fatal error: returning to the gate for a mechanical issue >>>> compilation terminated. >>>> >>>> include/ChangeLog: >>>> >>>>     * filenames.h: Added IS_REAL_ABSOLUTE_PATH macro to check if >>>>     path is absolute and not semi-absolute on Windows. >>> >>> Hm, this is unfortunate.  The current IS_ABSOLUTE_PATH, is really >>> 'not relative to cwd', and even then that's untrue if the drive >>> letter there is the drive letter of cwd, right? >>> >>> It's awkward to have a new macro for just this purpose and the new >>> name isn't very indicative of the difference to the current >>> IS_ABSOLUTE_PATH. >>> >>> Would it be better to not deal with drive letters here?  How >>> prevalent are they these days in windows?  Would something like >>> >>>     if (IS_DIR_SEPARATOR (ptr[ptr[0] == '.']) >>> >>> suffice? >> >> I don't think you can ignore the drive letter part... see below. >> >> >> #include >> #include "include/filenames.h" >> #define TF(x) ((x) ? "true" : "false") >> int main(int argc, char *argv[]) { >>    const char *test[] = { >>        /* absolute */      "c:\\foo", "c:/foo", "/foo", "\\foo", >>        /* semi-absolute */ "c:foo", >>        /* relative */      "foo", "./foo", ".\\foo", >>    }; >>    for (int i = 0; i < sizeof(test) / sizeof(test[0]); i++) { >>      const char *ptr = test[i]; >>      printf("\nptr: %s\n", ptr); >>      printf("  IS_DOS_ABSOLUTE_PATH: %s\n", >>             TF(IS_DOS_ABSOLUTE_PATH(ptr))); >>      printf("  IS_DOS_REAL_ABSOLUTE_PATH: %s\n", >>             TF(IS_DOS_REAL_ABSOLUTE_PATH(ptr))); >>      printf("  IS_DIR_SEPARATOR: %s\n", >>             TF(IS_DIR_SEPARATOR(ptr[ptr[0] == '.']))); >>    } >>    return 0; >> } >> >> >> The output is: >> >> ptr: c:\foo >>    IS_DOS_ABSOLUTE_PATH: true >>    IS_DOS_REAL_ABSOLUTE_PATH: true >>    IS_DIR_SEPARATOR: false >> >> ptr: c:/foo >>    IS_DOS_ABSOLUTE_PATH: true >>    IS_DOS_REAL_ABSOLUTE_PATH: true >>    IS_DIR_SEPARATOR: false >> >> ptr: /foo >>    IS_DOS_ABSOLUTE_PATH: true >>    IS_DOS_REAL_ABSOLUTE_PATH: true >>    IS_DIR_SEPARATOR: true >> >> ptr: \foo >>    IS_DOS_ABSOLUTE_PATH: true >>    IS_DOS_REAL_ABSOLUTE_PATH: true >>    IS_DIR_SEPARATOR: false >> >> ptr: c:foo >>    IS_DOS_ABSOLUTE_PATH: true >>    IS_DOS_REAL_ABSOLUTE_PATH: false >>    IS_DIR_SEPARATOR: false >> >> ptr: foo >>    IS_DOS_ABSOLUTE_PATH: false >>    IS_DOS_REAL_ABSOLUTE_PATH: false >>    IS_DIR_SEPARATOR: false >> >> ptr: ./foo >>    IS_DOS_ABSOLUTE_PATH: false >>    IS_DOS_REAL_ABSOLUTE_PATH: false >>    IS_DIR_SEPARATOR: true >> >> ptr: .\foo >>    IS_DOS_ABSOLUTE_PATH: false >>    IS_DOS_REAL_ABSOLUTE_PATH: false >>    IS_DIR_SEPARATOR: false >> >> >>> >>> or, failing that perhaps put some explicit WINDOWS-specific #ifdef'd >>> code there?  It's a real corner case. >> >> Would you rather have something like this in module.cc? >> >> if (ptr[0] == '.') >>    { >>      if IS_DIR_SEPARATOR (ptr[1])) >>        return get_module (build_string (strlen (ptr), ptr)); >>    } >> else >>    { >> #if HAVE_DOS_BASED_FILE_SYSTEM >>      if (HAS_DRIVE_SPEC (ptr) && IS_DIR_SEPARATOR (ptr[2])) >> #else >>      if (IS_ABSOLUTE_PATH (ptr)) >> #endif >>        return get_module (build_string (strlen (ptr), ptr)); >>    } > > Yes, something like the above, but I think you're missing "/bob' in the > DOS_BASED case?  shouldn't that also be a pathname? > > if (IS_DIR_SEPARATOR (ptr[ptr[0] == '.']) // ./FOO or /FOO > #if HAVE_DOS_BASED_FILE_SYSTEM >     // DOS-FS IS_ABSOLUTE_PATH thinks 'A:B' is absolute, but we need to > consider >     // that as a module:partition. >     || (HAS_DRIVE_SPEC (ptr) && IS_DIR_SEPARATOR (ptr[2])) // A:/FOO > #endif >     || false) >    return .... > > Does (something like) that work? I tested it and your solution appears to work. Are you okay with me pushing that solution or do you want me to send a v2 with it first? Kind regards, Torbjörn > > nathan > >> >> >> Let me know what you prefer. >> >> Kind regards, >> Torbjörn >> >>> >>> nathan >>> >>>> >>>> gcc/cp/ChangeLog: >>>> >>>>     * module.cc: Use IS_REAL_ABSOLUTE_PATH macro. >>>> >>>> Co-Authored-By: Yvan ROUX >>>> Signed-off-by: Torbjörn SVENSSON >>>> --- >>>>   gcc/cp/module.cc    | 2 +- >>>>   include/filenames.h | 4 ++++ >>>>   2 files changed, 5 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc >>>> index 9957df510e6..84680e183b7 100644 >>>> --- a/gcc/cp/module.cc >>>> +++ b/gcc/cp/module.cc >>>> @@ -13958,7 +13958,7 @@ get_module (tree name, module_state *parent, >>>> bool partition) >>>>   static module_state * >>>>   get_module (const char *ptr) >>>>   { >>>> -  if (ptr[0] == '.' ? IS_DIR_SEPARATOR (ptr[1]) : IS_ABSOLUTE_PATH >>>> (ptr)) >>>> +  if (ptr[0] == '.' ? IS_DIR_SEPARATOR (ptr[1]) : >>>> IS_REAL_ABSOLUTE_PATH (ptr)) >>>>       /* A header name.  */ >>>>       return get_module (build_string (strlen (ptr), ptr)); >>>> diff --git a/include/filenames.h b/include/filenames.h >>>> index 6c72c422edd..d04fccfed64 100644 >>>> --- a/include/filenames.h >>>> +++ b/include/filenames.h >>>> @@ -43,6 +43,7 @@ extern "C" { >>>>   #  define HAS_DRIVE_SPEC(f) HAS_DOS_DRIVE_SPEC (f) >>>>   #  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c) >>>>   #  define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f) >>>> +#  define IS_REAL_ABSOLUTE_PATH(f) IS_DOS_REAL_ABSOLUTE_PATH (f) >>>>   #else /* not DOSish */ >>>>   #  if defined(__APPLE__) >>>>   #    ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM >>>> @@ -52,6 +53,7 @@ extern "C" { >>>>   #  define HAS_DRIVE_SPEC(f) (0) >>>>   #  define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c) >>>>   #  define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f) >>>> +#  define IS_REAL_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH (f) >>>>   #endif >>>>   #define IS_DIR_SEPARATOR_1(dos_based, c)                \ >>>> @@ -67,6 +69,8 @@ extern "C" { >>>>   #define IS_DOS_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (1, c) >>>>   #define IS_DOS_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (1, f) >>>> +#define IS_DOS_REAL_ABSOLUTE_PATH(f) \ >>>> +  ((f)[0] && (f)[1] == ':' && ((f)[2] == '/' || (f)[2] == '\\')) >>>>   #define HAS_DOS_DRIVE_SPEC(f) HAS_DRIVE_SPEC_1 (1, f) >>>>   #define IS_UNIX_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (0, c) >>> >