aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn SVENSSON <torbjorn.svensson@foss.st.com>2022-10-27 18:03:15 +0200
committerTorbjörn SVENSSON <torbjorn.svensson@foss.st.com>2022-11-28 16:49:31 +0100
commitd30e98b54d6a5124bb48b10b593e264f048d38aa (patch)
tree1d9bb677eada9c7d4ffe2ca86fd4fd71fc796535
parentc775e2b81fca39f366040d423e3e44f4abecf753 (diff)
downloadgcc-d30e98b54d6a5124bb48b10b593e264f048d38aa.zip
gcc-d30e98b54d6a5124bb48b10b593e264f048d38aa.tar.gz
gcc-d30e98b54d6a5124bb48b10b593e264f048d38aa.tar.bz2
c++: Allow module name to be a single letter on Windows
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. Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
-rw-r--r--gcc/cp/module.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
index a176435..7133009 100644
--- a/gcc/cp/module.cc
+++ b/gcc/cp/module.cc
@@ -13987,7 +13987,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));