monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle case where asm resolver returns a later version

Browse Source
This commit is contained in:
de4dot 2011-11-05 13:58:03 +01:00
parent 52c3c160cd
commit 51fc70169d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
de4dot.code/renamer/ExternalAssemblies.cs
View File

@ -64,9 +64,20 @@ namespace de4dot.renamer {
Log.w("Could not load assembly {0}", asmFullName); Log.w("Could not load assembly {0}", asmFullName);
return null; return null;
} }
Log.v("Loaded assembly {0}", asmFullName); if (assemblies.ContainsKey(asmDef.Name.FullName)) {
assemblies[asmFullName] = assemblies[asmDef.Name.FullName];
return assemblies[asmDef.Name.FullName];
}
return assemblies[asmFullName] = asm = new ExternalAssembly(asmDef); if (asmFullName == asmDef.Name.FullName)
Log.v("Loaded assembly {0}", asmFullName);
else
Log.v("Loaded assembly {0} (but wanted {1})", asmDef.Name.FullName, asmFullName);
asm = new ExternalAssembly(asmDef);
assemblies[asmFullName] = asm;
assemblies[asmDef.Name.FullName] = asm;
return asm;
} }
public TypeDefinition resolve(TypeReference type) { public TypeDefinition resolve(TypeReference type) {