fix: Fix the issue with Elympics.dll becoming locked

dsygocki · dsygocki · commit 2db404dc6f78 · 2026-03-02T12:35:41.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -141,4 +141,5 @@ crashlytics-build.properties
 Assets/GIT_IGNORE/
 Assets/GIT_IGNORE.meta
 
-
+# Related to the internal test for Elympics.dll weaving lock problem
+Runtime/WeaverLockingProblemTest.*
diff --git a/Editor/Weaving/ElympicsRpcComponent.cs b/Editor/Weaving/ElympicsRpcComponent.cs
@@ -1,7 +1,9 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Elympics.Weaver;
 using Elympics.Weaver.Extensions;
+using Elympics.Weaving;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 
@@ -14,8 +16,10 @@ public class ElympicsRpcComponent : WeaverComponent
 
         private ElympicsWeaverAssembly _assembly;
 
-        public override void VisitModule(ModuleDefinition moduleDefinition) =>
+        protected override void StartVisiting(ModuleDefinition moduleDefinition)
+        {
             _assembly = new ElympicsWeaverAssembly(moduleDefinition.Assembly);
+        }
 
         internal void ValidateRpcMethodDefinition(MethodDefinition methodDefinition)
         {
@@ -153,5 +157,14 @@ public override void VisitMethod(MethodDefinition methodDefinition)
             // Calling standard method
             rpcILProcessor.InsertBefore(firstInstruction, originalMethodBodyBranch);
         }
+
+        protected override void FinishVisiting(ModuleDefinition moduleDefinition)
+        {
+            var processedAttribute = new CustomAttribute(moduleDefinition
+                .ImportReference(typeof(ProcessedByElympicsAttribute).GetConstructor(Array.Empty<Type>())));
+            moduleDefinition.Assembly.CustomAttributes.Add(processedAttribute);
+
+            _assembly = null;
+        }
     }
 }
diff --git a/Editor/Weaving/Weaver/WeaverExtension.cs b/Editor/Weaving/Weaver/WeaverExtension.cs
@@ -1,5 +1,4 @@
 using System;
-using Elympics.Weaving;
 using Mono.Cecil;
 using UnityEngine;
 
@@ -66,13 +65,15 @@ public bool EffectsDefintion(DefinitionType type)
         /// Invoked whenever we start editing a module. Used to populate our
         /// helper functions
         /// </summary>
-        public virtual void OnBeforeModuleEdited(ModuleDefinition moduleDefinition, Log log)
+        public void OnBeforeModuleEdited(ModuleDefinition moduleDefinition, Log log)
         {
             if (m_RequiredScriptingSymbols.isActive)
             {
                 m_Log = log;
                 m_ActiveModule = moduleDefinition;
                 Log("Visiting module");
+
+                StartVisiting(moduleDefinition);
             }
             else
             {
@@ -83,21 +84,21 @@ public virtual void OnBeforeModuleEdited(ModuleDefinition moduleDefinition, Log
         /// <summary>
         /// Invoked when we have finished editing a module
         /// </summary>
-        public virtual void OnModuleEditComplete(ModuleDefinition moduleDefinition)
+        public void OnModuleEditComplete(ModuleDefinition moduleDefinition)
         {
-            var processedAttribute = new CustomAttribute(moduleDefinition
-                .ImportReference(typeof(ProcessedByElympicsAttribute).GetConstructor(Array.Empty<Type>())));
-            moduleDefinition.Assembly.CustomAttributes.Add(processedAttribute);
+            FinishVisiting(moduleDefinition);
 
             m_ActiveModule = null;
             Log("Module visitation complete");
         }
 
+        protected virtual void StartVisiting(ModuleDefinition moduleDefinition) { }
         public virtual void VisitModule(ModuleDefinition moduleDefinition) { }
         public virtual void VisitType(TypeDefinition typeDefinition) { }
         public virtual void VisitMethod(MethodDefinition methodDefinition) { }
         public virtual void VisitField(FieldDefinition fieldDefinition) { }
         public virtual void VisitProperty(PropertyDefinition propertyDefinition) { }
+        protected virtual void FinishVisiting(ModuleDefinition moduleDefinition) { }
 
         #region -= Logging =-
         /// <summary>
