Fixed failure on release building.

kekyo · May 1, 2024 · 8764b62 · 8764b62
1 parent 06a6eb6
commit 8764b62
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/chibild/chibild.core/Generating/AssemblyInputFragment.cs b/chibild/chibild.core/Generating/AssemblyInputFragment.cs
@@ -136,13 +136,20 @@ private ModuleDefinition ResovleOnFallbackModule(
         ModuleDefinition fallbackModule, MemberReference mr)
     {
         var anr = mr.Module.Assembly.Name;
-        if (!this.resolvedModules.TryGetValue(anr.Name, out var module))
+
+        lock (this.resolvedModules)
         {
-            var assembly = fallbackModule.AssemblyResolver.Resolve(anr);
-            module = assembly.MainModule;
-            this.resolvedModules.Add(anr.Name, module);
+            if (!this.resolvedModules.TryGetValue(anr.Name, out var module))
+            {
+                lock (fallbackModule)
+                {
+                    var assembly = fallbackModule.AssemblyResolver.Resolve(anr);
+                    module = assembly.MainModule;
+                }
+                this.resolvedModules.Add(anr.Name, module);
+            }
+            return module;
         }
-        return module;
     }
 
     public override bool TryGetType(

diff --git a/chibild/chibild.core/Generating/CodeGenerator.cs b/chibild/chibild.core/Generating/CodeGenerator.cs
@@ -178,7 +178,7 @@ public bool ConsumeInputs(
         Parallel.ForEach(inputFragments, currentFragment =>
         {
             if (currentFragment is ObjectInputFragment ofif &&
-                ofif is not ArchivedFileInputFragment)
+                ofif is not ArchivedObjectInputFragment)
             {
                 this.ConsumeFragment(ofif, inputFragments);
             }
@@ -211,7 +211,7 @@ public bool ConsumeInputs(
 #else
             Parallel.ForEach(inputFragments, currentFragment =>
             {
-                if (currentFragment is ArchivedFileInputFragment afif &&
+                if (currentFragment is ArchivedObjectInputFragment afif &&
                     afif.LoadObjectIfRequired(
                         this.logger,
                         isLocationOriginSource))