Merge b11b955 into 5d8e2b9

mkaring · web-flow · commit b60b3c515d6f · 2021-07-14T17:40:08.000Z
diff --git a/Confuser.Core/Marker.cs b/Confuser.Core/Marker.cs
@@ -150,7 +150,9 @@ protected internal virtual MarkerResult MarkProject(ConfuserProject proj, Confus
 				if (module.IsExternal) {
 					var rawModule = module.LoadRaw(proj.BaseDirectory);
 					extModules.Add(rawModule);
-					context.InternalResolver.AddToCache(ModuleDefMD.Load(rawModule, context.InternalResolver.DefaultModuleContext));
+					var extModule = ModuleDefMD.Load(rawModule, context.InternalResolver.DefaultModuleContext);
+					extModule.EnableTypeDefFindCache = true;
+					context.InternalResolver.AddToCache(extModule);
 					continue;
 				}
 
diff --git a/Confuser.Renamer/AnalyzePhase.cs b/Confuser.Renamer/AnalyzePhase.cs
@@ -31,6 +31,10 @@ void ParseParameters(IDnlibDef def, ConfuserContext context, NameService service
 		protected override void Execute(ConfuserContext context, ProtectionParameters parameters) {
 			var service = (NameService)context.Registry.GetService<INameService>();
 			context.Logger.Debug("Building VTables & identifier list...");
+
+			foreach (ModuleDef moduleDef in parameters.Targets.OfType<ModuleDef>())
+				moduleDef.EnableTypeDefFindCache = true;
+
 			foreach (IDnlibDef def in parameters.Targets.WithProgress(context.Logger)) {
 				ParseParameters(def, context, service, parameters);
 
@@ -54,6 +58,11 @@ protected override void Execute(ConfuserContext context, ProtectionParameters pa
 				Analyze(service, context, parameters, def, true);
 				context.CheckCancellation();
 			}
+
+			foreach (ModuleDef moduleDef in parameters.Targets.OfType<ModuleDef>()) {
+				moduleDef.EnableTypeDefFindCache = false;
+				moduleDef.ResetTypeDefFindCache();
+			}
 		}
 
 		void RegisterRenamers(ConfuserContext context, NameService service) {
