Browse Source

Remove obsolete code from DelegateConstruction.cs

pull/1561/head
Siegfried Pammer 6 years ago
parent
commit
b4a59ae4dd
  1. 9
      ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs
  2. 20
      ICSharpCode.Decompiler/IL/Transforms/TransformDisplayClassUsage.cs

9
ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs

@ -16,9 +16,7 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection.Metadata;
using ICSharpCode.Decompiler.CSharp;
@ -37,8 +35,6 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return;
this.context = context;
this.decompilationContext = new SimpleTypeResolveContext(function.Method);
var targetsToReplace = new List<IInstructionWithVariableOperand>();
var translatedDisplayClasses = new HashSet<ITypeDefinition>();
var cancellationToken = context.CancellationToken;
foreach (var inst in function.Descendants) {
cancellationToken.ThrowIfCancellationRequested();
@ -55,16 +51,12 @@ namespace ICSharpCode.Decompiler.IL.Transforms
instWithVar.Variable.CaptureScope = BlockContainer.FindClosestContainer(store);
}
}
if (displayClassTypeDef != null)
translatedDisplayClasses.Add(displayClassTypeDef);
targetsToReplace.Add(instWithVar);
}
context.StepEndGroup();
}
}
}
#region TransformDelegateConstruction
internal static bool IsDelegateConstruction(NewObj inst, bool allowTransformed = false)
{
if (inst == null || inst.Arguments.Count != 2 || inst.Method.DeclaringType.Kind != TypeKind.Delegate)
@ -213,6 +205,5 @@ namespace ICSharpCode.Decompiler.IL.Transforms
base.VisitLdObj(inst);
}
}
#endregion
}
}

20
ICSharpCode.Decompiler/IL/Transforms/TransformDisplayClassUsage.cs

@ -1,4 +1,22 @@
using System;
// Copyright (c) 2019 Siegfried Pammer
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;

Loading…
Cancel
Save