From 75a4e2cdad64d199065770f5696cba6b7191847e Mon Sep 17 00:00:00 2001 From: walon Date: Mon, 9 Jun 2025 13:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E6=B7=B7=E6=B7=86=E4=B8=ADme?= =?UTF-8?q?thod=E5=92=8Cfield=E5=90=8D=E5=85=A8=E5=B1=80=E5=94=AF=E4=B8=80?= =?UTF-8?q?=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=BF=98=E5=8E=9F=E6=B7=B7=E6=B7=86?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SymbolObfus/NameMakers/NameMakerBase.cs | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/Editor/ObfusPasses/SymbolObfus/NameMakers/NameMakerBase.cs b/Editor/ObfusPasses/SymbolObfus/NameMakers/NameMakerBase.cs index f8cd198..2241f31 100644 --- a/Editor/ObfusPasses/SymbolObfus/NameMakers/NameMakerBase.cs +++ b/Editor/ObfusPasses/SymbolObfus/NameMakers/NameMakerBase.cs @@ -12,6 +12,8 @@ namespace Obfuz.ObfusPasses.SymbolObfus.NameMakers private readonly object _namespaceScope = new object(); private readonly object _typeNameScope = new object(); + private readonly object _methodNameScope = new object(); + private readonly object _fieldNameScope = new object(); protected abstract INameScope CreateNameScope(); @@ -32,12 +34,12 @@ namespace Obfuz.ObfusPasses.SymbolObfus.NameMakers public void AddPreservedName(MethodDef methodDef, string name) { - GetNameScope(methodDef.DeclaringType).AddPreservedName(name); + GetNameScope(_methodNameScope).AddPreservedName(name); } public void AddPreservedName(FieldDef fieldDef, string name) { - GetNameScope(fieldDef.DeclaringType).AddPreservedName(name); + GetNameScope(_fieldNameScope).AddPreservedName(name); } public void AddPreservedName(PropertyDef propertyDef, string name) @@ -57,7 +59,8 @@ namespace Obfuz.ObfusPasses.SymbolObfus.NameMakers public bool IsNamePreserved(VirtualMethodGroup virtualMethodGroup, string name) { - return virtualMethodGroup.GetNameConflictTypeScopes().Any(m => GetNameScope(m).IsNamePreserved(name)); + var scope = GetNameScope(_methodNameScope); + return scope.IsNamePreserved(name); } private string GetDefaultNewName(object scope, string originName) @@ -82,28 +85,13 @@ namespace Obfuz.ObfusPasses.SymbolObfus.NameMakers public string GetNewName(MethodDef methodDef, string originalName) { Assert.IsFalse(methodDef.IsVirtual); - return GetDefaultNewName(methodDef.DeclaringType, originalName); + return GetDefaultNewName(_methodNameScope, originalName); } public string GetNewName(VirtualMethodGroup virtualMethodGroup, string originalName) { - var scope = GetNameScope(virtualMethodGroup); - while (true) - { - string newName = scope.GetNewName(originalName, false); - if (virtualMethodGroup.GetNameConflictTypeScopes().Any(s => GetNameScope(s).IsNamePreserved(newName))) - { - continue; - } - else - { - foreach (var s in virtualMethodGroup.GetNameDeclaringTypeScopes()) - { - GetNameScope(s).AddPreservedName(newName); - } - return newName; - } - } + var scope = GetNameScope(_methodNameScope); + return scope.GetNewName(originalName, false); } public virtual string GetNewName(ParamDef param, string originalName) @@ -113,7 +101,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.NameMakers public string GetNewName(FieldDef fieldDef, string originalName) { - return GetDefaultNewName(fieldDef.DeclaringType, originalName); + return GetDefaultNewName(_fieldNameScope, originalName); } public string GetNewName(PropertyDef propertyDef, string originalName)