Gittes-archive/AssetRipper_AssetRipper
2
0
Fork 0
mirror of https://github.com/AssetRipper/AssetRipper.git synced 2025-12-11 20:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve decompilation for methods that return a byref

Browse Source
This commit is contained in:
ds5678 2025-03-30 22:37:52 -07:00
parent 918b69af96
commit fab3242a75
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/AssetRipper.Export.UnityProjects/ExportHandler.cs
View File

@ -66,6 +66,7 @@ public class ExportHandler
{
yield return new MethodStubbingProcessor();
}
yield return new NullRefReturnProcessor(Settings.ImportSettings.ScriptContentLevel);
yield return new UnmanagedConstraintRecoveryProcessor();
if (Settings.ProcessingSettings.RemoveNullableAttributes)
{

42
Source/AssetRipper.Processing/Assemblies/NullRefReturnProcessor.cs Normal file
View File

@ -0,0 +1,42 @@
using AsmResolver.DotNet;
using AsmResolver.DotNet.Code.Cil;
using AsmResolver.DotNet.Signatures;
using AsmResolver.PE.DotNet.Cil;
using AssetRipper.Import.Configuration;
using AssetRipper.Import.Structure.Assembly;
using AssetRipper.Import.Structure.Assembly.Managers;
namespace AssetRipper.Processing.Assemblies;
/// <summary>
/// Returning a null by reference causes an error before C# 11. This replaces the method body with a throw statement.
/// </summary>
public sealed class NullRefReturnProcessor(ScriptContentLevel scriptContentLevel) : IAssetProcessor
{
public void Process(GameData gameData) => Process(gameData.AssemblyManager);
private void Process(IAssemblyManager manager)
{
if (manager.ScriptingBackend != ScriptingBackend.IL2Cpp && scriptContentLevel > ScriptContentLevel.Level1)
{
return; // Mono doesn't have method stubs, so this isn't necessary.
}
else if (scriptContentLevel > ScriptContentLevel.Level2)
{
return; // Il2Cpp doesn't have method stubs on Level 3 and above.
}
manager.ClearStreamCache();
foreach (MethodDefinition method in manager.GetAllMethods())
{
if (method.Signature?.ReturnType is ByReferenceTypeSignature)
{
method.CilMethodBody = new CilMethodBody(method);
CilInstructionCollection instructions = method.CilMethodBody.Instructions;
instructions.Add(CilOpCodes.Ldnull);
instructions.Add(CilOpCodes.Throw);
}
}
}
}