Merge pull request #6450 from Arthapz/optimize-module-support

(C++ modules support) Optimize module scanner

1 files changed, 11 insertions, 16 deletions

diff --git a/xmake/rules/c++/modules/support.lua b/xmake/rules/c++/modules/support.lua
index faaa57369..dc838c418 100644
--- a/xmake/rules/c++/modules/support.lua
+++ b/xmake/rules/c++/modules/support.lua
@@ -23,6 +23,7 @@ import("core.base.json")
 import("core.base.hashset")
 import("core.cache.memcache", {alias = "_memcache"})
 import("core.cache.localcache", {alias = "_localcache"})
+import("async.runjobs")
 import("lib.detect.find_file")
 import("core.project.project")
 import("core.project.config")
@@ -234,24 +235,18 @@ function can_be_culled(target, sourcefile)
 end
 
 -- load module infos
-function load_moduleinfos(target, sourcebatch)
-    local moduleinfos
-    for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
-        local reused, from = is_reused(target, sourcefile)
-        local dependfile = reused and from:dependfile(sourcefile) or target:dependfile(sourcefile)
-        if os.isfile(dependfile) then
-            local data = io.load(dependfile)
-            if data then
-                moduleinfos = moduleinfos or {}
-                local moduleinfo = json.decode(data.moduleinfo)
-                moduleinfo.sourcefile = sourcefile
-                if moduleinfo then
-                    table.insert(moduleinfos, moduleinfo)
-                end
-            end
+function load_moduleinfo(target, sourcefile)
+    local reused, from = is_reused(target, sourcefile)
+    local dependfile = reused and from:dependfile(sourcefile) or target:dependfile(sourcefile)
+    local moduleinfo
+    if os.isfile(dependfile) then
+        local data = io.load(dependfile)
+        if data then
+            moduleinfo = json.decode(data.moduleinfo)
+            moduleinfo.sourcefile = sourcefile
         end
     end
-    return moduleinfos
+    return moduleinfo
 end
 
 function find_quote_header_file(sourcefile, file)