From 4f44dea40d7ecb245d4cb685351252f21f25d34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A4ll=C3=A9n?= Date: Tue, 30 Apr 2024 02:26:25 +0200 Subject: [PATCH] Fix: git rebase failure --- src/Decompiler/Analysis/CallRewriter.cs | 6 ------ src/Decompiler/Analysis/SignatureBuilder.cs | 8 -------- src/Decompiler/Scanning/BackwardSlicer.cs | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/Decompiler/Analysis/CallRewriter.cs b/src/Decompiler/Analysis/CallRewriter.cs index 31f6ec47bf..e390fc2c7a 100644 --- a/src/Decompiler/Analysis/CallRewriter.cs +++ b/src/Decompiler/Analysis/CallRewriter.cs @@ -123,12 +123,6 @@ public FunctionType MakeSignature(SsaState ssa, ProcedureFlow flow) return sig; } - private ICallingConvention? GuessCallingConvention(SignatureBuilder sb, IProcessorArchitecture architecture) - { - //$TODO: #1338 - return null; - } - void ProcessInputStorages(SsaState ssa, ProcedureFlow flow, SignatureBuilder sb) { var frame = ssa.Procedure.Frame; diff --git a/src/Decompiler/Analysis/SignatureBuilder.cs b/src/Decompiler/Analysis/SignatureBuilder.cs index ceccf3444d..5f8b3a55ee 100644 --- a/src/Decompiler/Analysis/SignatureBuilder.cs +++ b/src/Decompiler/Analysis/SignatureBuilder.cs @@ -91,14 +91,6 @@ public void AddInParam(Identifier arg) parameters.Add(arg); } - public void SortParameters(ICallingConvention cc) - { - if (cc.InArgumentComparer is not null) - { - args.Sort(cc.InArgumentComparer); - } - } - public FunctionType BuildSignature() { return FunctionType.Create(ret, parameters.ToArray()); diff --git a/src/Decompiler/Scanning/BackwardSlicer.cs b/src/Decompiler/Scanning/BackwardSlicer.cs index 6ee579f4af..bc324628a6 100644 --- a/src/Decompiler/Scanning/BackwardSlicer.cs +++ b/src/Decompiler/Scanning/BackwardSlicer.cs @@ -56,7 +56,7 @@ namespace Reko.Scanning /// public class BackwardSlicer { - public static readonly TraceSwitch trace = new TraceSwitch(nameof(BackwardSlicer), "Traces the backward slicer") { Level = TraceLevel.Warning }; + public static readonly TraceSwitch trace = new TraceSwitch(nameof(BackwardSlicer), "Traces the backward slicer") { Level = TraceLevel.Verbose }; internal IBackWalkHost host; private readonly RtlBlock rtlBlock;