(C++ modules support) cache stealed sourcebatch

1 files changed, 29 insertions, 23 deletions

diff --git a/xmake/rules/c++/modules/scanner.lua b/xmake/rules/c++/modules/scanner.lua
index 0485bd82c..4f75bc7e9 100644
--- a/xmake/rules/c++/modules/scanner.lua
+++ b/xmake/rules/c++/modules/scanner.lua
@@ -416,12 +416,12 @@ end
 function _do_parse(target, sourcebatch)
 
     profiler.enter(target:fullname(), "c++ modules", "scanner", "parse module dependencies and compute dependency graph")
+    local localcache = support.localcache()
     local changed = support.memcache():get2(target:fullname(), "modules.changed")
     local modules
     if changed then
         local moduleinfos = support.load_moduleinfos(target, sourcebatch)
         modules = _parse_dependencies_data(target, moduleinfos)
-        local localcache = support.localcache()
         localcache:set2(target:fullname(), "c++.modules", modules)
 
         mapper.feed(target, modules, sourcebatch.sourcefiles)
@@ -440,30 +440,36 @@ function _do_parse(target, sourcebatch)
                 end
             end
         end
-    else
-        modules = get_modules(target)
-    end
-
-    -- steal from c++.build sourcebatch named modules with cpp extensions
-    local sourcebatches = target:sourcebatches()
-    if sourcebatches and sourcebatches["c++.build"] then
-        local cxx_sourcebatch = sourcebatches["c++.build"]
-        cxx_sourcebatch.sourcefiles = {}
-        cxx_sourcebatch.dependfiles = {}
-        cxx_sourcebatch.objectfiles = {}
-        for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
-            local module = mapper.get(target, sourcefile)
-            local insert = true
-            if module then
-                insert = not module.name
-            end
+        -- steal from c++.build sourcebatch named modules with cpp extensions
+        local sourcebatches = target:sourcebatches()
+        if sourcebatches and sourcebatches["c++.build"] then
+            local cxx_sourcebatch = sourcebatches["c++.build"]
+            cxx_sourcebatch.sourcefiles = {}
+            cxx_sourcebatch.dependfiles = {}
+            cxx_sourcebatch.objectfiles = {}
+            for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
+                local insert = true
+                if module then
+                    insert = not module.name
+                end
 
-            if insert then
-                table.insert(cxx_sourcebatch.sourcefiles, sourcefile)
-                local objectfile = target:objectfile(sourcefile)
-                table.insert(cxx_sourcebatch.dependfiles, target:dependfile(objectfile))
-                table.insert(cxx_sourcebatch.objectfiles, objectfile)
+                if insert then
+                    table.insert(cxx_sourcebatch.sourcefiles, sourcefile)
+                    local objectfile = target:objectfile(sourcefile)
+                    table.insert(cxx_sourcebatch.dependfiles, target:dependfile(objectfile))
+                    table.insert(cxx_sourcebatch.objectfiles, objectfile)
+                end
             end
+            localcache:set2("c++.modules", target:fullname() .. ".c++.build.sourcebatch", cxx_sourcebatch)
+        end
+    else
+        modules = get_modules(target)
+        local cxx_sourcebatch_cached = localcache:get2("c++.modules", target:fullname() .. ".c++.build.sourcebatch")
+        if cxx_sourcebatch_cached then
+            local cxx_sourcebatch = target:sourcebatches()["c++.build"]
+            cxx_sourcebatch.sourcefiles = cxx_sourcebatch_cached.sourcefiles
+            cxx_sourcebatch.dependfiles = cxx_sourcebatch_cached.dependfiles
+            cxx_sourcebatch.objectfiles = cxx_sourcebatch_cached.objectfiles
         end
     end