Skip to content

Commit 4409a1b

Browse files
authored
Fix fixed buffer fields (SamboyCoding#428)
1 parent aeab6f1 commit 4409a1b

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Cpp2IL.Core/Cpp2IL.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<ItemGroup>
4242
<!--Needed for DLL output-->
4343
<PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.3" />
44-
<PackageReference Include="AssetRipper.CIL" Version="1.1.5" />
44+
<PackageReference Include="AssetRipper.CIL" Version="1.1.6" />
4545

4646
<!--For ARM64 dissassembly-->
4747
<PackageReference Include="Disarm" Version="2022.1.0-master.57" />

Cpp2IL.Core/OutputFormats/AsmResolverDummyDllOutputFormat.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ public List<AssemblyDefinition> BuildAssemblies(ApplicationAnalysisContext conte
9393

9494
MiscUtils.ExecuteParallel(context.Assemblies, AsmResolverAssemblyPopulator.CopyDataFromIl2CppToManaged);
9595
MiscUtils.ExecuteParallel(context.Assemblies, AsmResolverAssemblyPopulator.AddExplicitInterfaceImplementations);
96-
MiscUtils.ExecuteParallel(context.Assemblies, FillMethodBodies);
9796

9897
Logger.VerboseNewline($"{(DateTime.Now - start).TotalMilliseconds:F1}ms", "DllOutput");
9998

@@ -104,6 +103,13 @@ public List<AssemblyDefinition> BuildAssemblies(ApplicationAnalysisContext conte
104103

105104
Logger.VerboseNewline($"{(DateTime.Now - start).TotalMilliseconds:F1}ms", "DllOutput");
106105

106+
//Fill method bodies - this should always be done last
107+
start = DateTime.Now;
108+
Logger.Verbose($"Filling method bodies (in parallel)...", "DllOutput");
109+
MiscUtils.ExecuteParallel(context.Assemblies, FillMethodBodies);
110+
111+
Logger.VerboseNewline($"{(DateTime.Now - start).TotalMilliseconds:F1}ms", "DllOutput");
112+
107113
TypeDefinitionsAsmResolver.Reset();
108114

109115
return ret;

0 commit comments

Comments
 (0)