Message ID | 20221117132021.1143935-1-torbjorn.svensson@foss.st.com |
---|---|
State | Committed |
Commit | d30e98b54d6a5124bb48b10b593e264f048d38aa |
Headers |
Return-Path: <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E638F39960FE for <patchwork@sourceware.org>; Thu, 17 Nov 2022 13:36:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E638F39960FE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668692174; bh=p7G6h+J3DFyegdFD1b5tyxCdMPrD/oRyHClYd3+JP7s=; h=To:CC:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=PmWw/CG/QjBrswmE1tlRGa3E+qkOx2gDgA5SBTmgcHebUWorAbkPnqHlvSUxieHFf wBUnW4zEFE01Qmg7PxSgPxfciXhsLEVqN6y+3Aump9qzlSB9t9MluDz6cspTzSWEyl pO128Xh2e3P1IYCeCnqnje+gY9w7os0QFC7cBLTY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) by sourceware.org (Postfix) with ESMTPS id AFD8B39960EA for <gcc-patches@gcc.gnu.org>; Thu, 17 Nov 2022 13:35:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AFD8B39960EA Received: from pps.filterd (m0288072.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AHCAAHZ008980; Thu, 17 Nov 2022 14:35:15 +0100 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 3kwjvkthv6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Nov 2022 14:35:15 +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 BD218100034; Thu, 17 Nov 2022 14:35:10 +0100 (CET) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id A499A209319; Thu, 17 Nov 2022 14:35:10 +0100 (CET) Received: from jkgcxl0002.jkg.st.com (10.210.54.218) 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.2507.6; Thu, 17 Nov 2022 14:35:07 +0100 To: <gcc-patches@gcc.gnu.org> CC: <nathan@acm.org>, <yvan.roux@foss.st.com>, =?utf-8?q?Torbj=C3=B6rn_SVENS?= =?utf-8?q?SON?= <torbjorn.svensson@foss.st.com> Subject: [PATCH v3] c++: Allow module name to be a single letter on Windows Date: Thu, 17 Nov 2022 14:20:22 +0100 Message-ID: <20221117132021.1143935-1-torbjorn.svensson@foss.st.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.210.54.218] X-ClientProxiedBy: EQNCAS1NODE3.st.com (10.75.129.80) 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-17_06,2022-11-17_01,2022-06-22_01 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> From: =?utf-8?q?Torbj=C3=B6rn_SVENSSON_via_Gcc-patches?= <gcc-patches@gcc.gnu.org> Reply-To: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= <torbjorn.svensson@foss.st.com> Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> |
Series |
[v3] c++: Allow module name to be a single letter on Windows
|
|
Commit Message
Torbjörn SVENSSON
Nov. 17, 2022, 1:20 p.m. UTC
v1 -> v2:
Paths without "C:" part can still be absolute if they start with / or
\ on Windows.
v2 -> v3:
Use alternative approach by having platform specific code in module.cc.
Truth table for the new expression:
c:\foo -> true
c:/foo -> true
/foo -> true
\foo -> true
c:foo -> false
foo -> false
./foo -> true
.\foo -> true
Ok for trunk?
---
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.
gcc/cp/ChangeLog:
* module.cc: On Windows, 'A:Foo' is supposed to be a module
and not a path.
Tested on Windows with arm-none-eabi for Cortex-M3 in gcc-11 tree.
Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com>
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
---
gcc/cp/module.cc | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
Comments
Hi, Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-November/606528.html Kind regards, Torbjörn On 2022-11-17 14:20, Torbjörn SVENSSON wrote: > v1 -> v2: > Paths without "C:" part can still be absolute if they start with / or > \ on Windows. > > v2 -> v3: > Use alternative approach by having platform specific code in module.cc. > > Truth table for the new expression: > c:\foo -> true > c:/foo -> true > /foo -> true > \foo -> true > c:foo -> false > foo -> false > ./foo -> true > .\foo -> true > > > Ok for trunk? > > --- > > 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. > > gcc/cp/ChangeLog: > > * module.cc: On Windows, 'A:Foo' is supposed to be a module > and not a path. > > Tested on Windows with arm-none-eabi for Cortex-M3 in gcc-11 tree. > > Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com> > Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com> > --- > gcc/cp/module.cc | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc > index 0e9af318ba4..fa41a86213f 100644 > --- a/gcc/cp/module.cc > +++ b/gcc/cp/module.cc > @@ -13960,7 +13960,15 @@ 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)) > + /* On DOS based file systems, there is an ambiguity with A:B which can be > + interpreted as a module Module:Partition or Drive:PATH. Interpret strings > + which clearly starts as pathnames as header-names and everything else is > + treated as a (possibly malformed) named moduled. */ > + if (IS_DIR_SEPARATOR (ptr[ptr[0] == '.']) // ./FOO or /FOO > +#if HAVE_DOS_BASED_FILE_SYSTEM > + || (HAS_DRIVE_SPEC (ptr) && IS_DIR_SEPARATOR (ptr[2])) // A:/FOO > +#endif > + || false) > /* A header name. */ > return get_module (build_string (strlen (ptr), ptr)); >
On 11/25/22 14:03, Torbjorn SVENSSON wrote: > Hi, > > Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-November/606528.html ok, thanks! > > Kind regards, > Torbjörn > > On 2022-11-17 14:20, Torbjörn SVENSSON wrote: >> v1 -> v2: >> Paths without "C:" part can still be absolute if they start with / or >> \ on Windows. >> >> v2 -> v3: >> Use alternative approach by having platform specific code in module.cc. >> >> Truth table for the new expression: >> c:\foo -> true >> c:/foo -> true >> /foo -> true >> \foo -> true >> c:foo -> false >> foo -> false >> ./foo -> true >> .\foo -> true >> >> >> Ok for trunk? >> >> --- >> >> 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. >> >> gcc/cp/ChangeLog: >> >> * module.cc: On Windows, 'A:Foo' is supposed to be a module >> and not a path. >> >> Tested on Windows with arm-none-eabi for Cortex-M3 in gcc-11 tree. >> >> Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com> >> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com> >> --- >> gcc/cp/module.cc | 10 +++++++++- >> 1 file changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc >> index 0e9af318ba4..fa41a86213f 100644 >> --- a/gcc/cp/module.cc >> +++ b/gcc/cp/module.cc >> @@ -13960,7 +13960,15 @@ 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)) >> + /* On DOS based file systems, there is an ambiguity with A:B which can be >> + interpreted as a module Module:Partition or Drive:PATH. Interpret strings >> + which clearly starts as pathnames as header-names and everything else is >> + treated as a (possibly malformed) named moduled. */ >> + if (IS_DIR_SEPARATOR (ptr[ptr[0] == '.']) // ./FOO or /FOO >> +#if HAVE_DOS_BASED_FILE_SYSTEM >> + || (HAS_DRIVE_SPEC (ptr) && IS_DIR_SEPARATOR (ptr[2])) // A:/FOO >> +#endif >> + || false) >> /* A header name. */ >> return get_module (build_string (strlen (ptr), ptr));
On 2022-11-28 12:21, Nathan Sidwell wrote: > On 11/25/22 14:03, Torbjorn SVENSSON wrote: >> Hi, >> >> Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-November/606528.html > > ok, thanks! Pushed. > >> >> Kind regards, >> Torbjörn >> >> On 2022-11-17 14:20, Torbjörn SVENSSON wrote: >>> v1 -> v2: >>> Paths without "C:" part can still be absolute if they start with / or >>> \ on Windows. >>> >>> v2 -> v3: >>> Use alternative approach by having platform specific code in module.cc. >>> >>> Truth table for the new expression: >>> c:\foo -> true >>> c:/foo -> true >>> /foo -> true >>> \foo -> true >>> c:foo -> false >>> foo -> false >>> ./foo -> true >>> .\foo -> true >>> >>> >>> Ok for trunk? >>> >>> --- >>> >>> 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. >>> >>> gcc/cp/ChangeLog: >>> >>> * module.cc: On Windows, 'A:Foo' is supposed to be a module >>> and not a path. >>> >>> Tested on Windows with arm-none-eabi for Cortex-M3 in gcc-11 tree. >>> >>> Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com> >>> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com> >>> --- >>> gcc/cp/module.cc | 10 +++++++++- >>> 1 file changed, 9 insertions(+), 1 deletion(-) >>> >>> diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc >>> index 0e9af318ba4..fa41a86213f 100644 >>> --- a/gcc/cp/module.cc >>> +++ b/gcc/cp/module.cc >>> @@ -13960,7 +13960,15 @@ 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)) >>> + /* On DOS based file systems, there is an ambiguity with A:B which >>> can be >>> + interpreted as a module Module:Partition or Drive:PATH. >>> Interpret strings >>> + which clearly starts as pathnames as header-names and >>> everything else is >>> + treated as a (possibly malformed) named moduled. */ >>> + if (IS_DIR_SEPARATOR (ptr[ptr[0] == '.']) // ./FOO or /FOO >>> +#if HAVE_DOS_BASED_FILE_SYSTEM >>> + || (HAS_DRIVE_SPEC (ptr) && IS_DIR_SEPARATOR (ptr[2])) // A:/FOO >>> +#endif >>> + || false) >>> /* A header name. */ >>> return get_module (build_string (strlen (ptr), ptr)); >
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 0e9af318ba4..fa41a86213f 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -13960,7 +13960,15 @@ 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)) + /* On DOS based file systems, there is an ambiguity with A:B which can be + interpreted as a module Module:Partition or Drive:PATH. Interpret strings + which clearly starts as pathnames as header-names and everything else is + treated as a (possibly malformed) named moduled. */ + if (IS_DIR_SEPARATOR (ptr[ptr[0] == '.']) // ./FOO or /FOO +#if HAVE_DOS_BASED_FILE_SYSTEM + || (HAS_DRIVE_SPEC (ptr) && IS_DIR_SEPARATOR (ptr[2])) // A:/FOO +#endif + || false) /* A header name. */ return get_module (build_string (strlen (ptr), ptr));