prompt an error when multiple module with the same names are detected

7 files changed, 83 insertions, 9 deletions

diff --git a/tests/projects/c++/modules/link_order/src/bar.mpp b/tests/projects/c++/modules/duplicate_name_detection/src/bar.mpp
index dc7c14ec8..a51969b8f 100644
--- a/tests/projects/c++/modules/link_order/src/bar.mpp
+++ b/tests/projects/c++/modules/duplicate_name_detection/src/bar.mpp
@@ -1,4 +1,4 @@
-export module duplicate;
+export module foo;
 
 export int value() {
     return 1;
diff --git a/tests/projects/c++/modules/link_order/src/foo.mpp b/tests/projects/c++/modules/duplicate_name_detection/src/foo.mpp
index eba3a4223..d97e5f085 100644
--- a/tests/projects/c++/modules/link_order/src/foo.mpp
+++ b/tests/projects/c++/modules/duplicate_name_detection/src/foo.mpp
@@ -1,4 +1,4 @@
-export module duplicate;
+export module foo;
 
 export int value() {
     return 0;
diff --git a/tests/projects/c++/modules/link_order/src/main.cpp b/tests/projects/c++/modules/duplicate_name_detection/src/main.cpp
index cd9524d8b..50ddf1fdd 100644
--- a/tests/projects/c++/modules/link_order/src/main.cpp
+++ b/tests/projects/c++/modules/duplicate_name_detection/src/main.cpp
@@ -1,4 +1,4 @@
-import duplicate;
+import foo;
 
 int main() {
     return value();
diff --git a/tests/projects/c++/modules/duplicate_name_detection/test.lua b/tests/projects/c++/modules/duplicate_name_detection/test.lua
new file mode 100644
index 000000000..5215735b5
--- /dev/null
+++ b/tests/projects/c++/modules/duplicate_name_detection/test.lua
@@ -0,0 +1,70 @@
+import("lib.detect.find_tool")
+import("core.base.semver")
+import("utils.ci.is_running", {alias = "ci_is_running"})
+
+function _build()
+    try {function() 
+        if ci_is_running() then
+            os.iorun("xmake -rvD")
+        else
+            os.iorun("xmake -r")
+        end
+    end, catch {function(errors)
+        errors = errors.errors
+        if not errors or not errors:find("detected") then
+            raise("Modules duplicate name detection does not work\n%s", errors.errors)
+        end
+    end}}
+end
+
+function can_build()
+    if is_subhost("windows") then
+        return true
+    elseif is_subhost("msys") then
+        return true
+    elseif is_host("linux") then
+        local gcc = find_tool("gcc", {version = true})
+        if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then
+            return true
+        end
+        local clang = find_tool("clang", {version = true})
+        if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then
+            return true
+        end
+    end
+end
+
+function main(t)
+    if is_subhost("windows") then
+        local clang = find_tool("clang", {version = true})
+        if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then
+            os.exec("xmake f --toolchain=clang -c --yes")
+            _build()
+            os.exec("xmake clean -a")
+            os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes")
+            _build()
+        end
+
+        os.exec("xmake clean -a")
+        os.exec("xmake f -c --yes")
+        _build()
+    elseif is_subhost("msys") then
+        os.exec("xmake f -c -p mingw --yes")
+        _build()
+    elseif is_host("linux") then
+        local gcc = find_tool("gcc", {version = true})
+if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then
+            os.exec("xmake f -c --yes")
+            _build()
+        end
+        local clang = find_tool("clang", {version = true})
+        if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then
+            os.exec("xmake clean -a")
+            os.exec("xmake f --toolchain=clang -c --yes")
+            _build()
+            os.exec("xmake clean -a")
+            os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes")
+            _build()
+        end
+    end
+end
diff --git a/tests/projects/c++/modules/link_order/xmake.lua b/tests/projects/c++/modules/duplicate_name_detection/xmake.lua
index 4cb2af87f..f4539695c 100644
--- a/tests/projects/c++/modules/link_order/xmake.lua
+++ b/tests/projects/c++/modules/duplicate_name_detection/xmake.lua
@@ -9,12 +9,12 @@ target("bar")
     set_kind("moduleonly")
     add_files("src/bar.mpp")
 
-target("link_order_1")
+target("duplicate_name_detection_1")
     set_kind("binary")
     add_deps("foo", "bar")
     add_files("src/main.cpp")
 
-target("link_order_2")
+target("duplicate_name_detection_2")
     set_kind("binary")
     add_deps("bar", "foo")
     add_files("src/main.cpp")
diff --git a/tests/projects/c++/modules/link_order/test.lua b/tests/projects/c++/modules/link_order/test.lua
deleted file mode 100644
index 7717f8049..000000000
--- a/tests/projects/c++/modules/link_order/test.lua
+++ /dev/null
@@ -1 +0,0 @@
-inherit(".test_base")
diff --git a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
index 7db818cf4..fe544ee77 100644
--- a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
+++ b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
@@ -175,15 +175,21 @@ end
 -- generate edges for DAG
 function _get_edges(nodes, modules)
   local edges = {}
+  local module_names = {}
+  local named_module_names = hashset.new()
   for _, node in ipairs(nodes) do
       local module = modules[node]
+      local module_name, _, _ = compiler_support.get_provided_module(module)
+      if module_name then
+          assert(not named_module_names:has(module_name), "duplicate module name detected \"" .. module_name .. "\"")
+          named_module_names:insert(module_name)
+      end
       if module.requires then
           for required_name, _ in table.orderpairs(module.requires) do
               for _, required_node in ipairs(nodes) do
                   local name, _, _ = compiler_support.get_provided_module(modules[required_node])
                   if name and name == required_name then
                       table.insert(edges, {required_node, node})
-                      break
                   end
               end
           end
@@ -200,8 +206,7 @@ function _get_package_modules(target, package, opt)
     for _, metafile in ipairs(metafiles) do
         package_modules = package_modules or {}
         local modulefile, name, metadata = _parse_meta_info(target, metafile)
-        local package_data = package["_INFO"]
-        local moduleonly = not package_data["libfiles"]
+        local moduleonly = not package:libraryfiles()
         package_modules[name] = {file = path.join(modulesdir, modulefile), metadata = metadata, external = {moduleonly = moduleonly}}
     end