Skip to content

Removed cust dynamic call sites processing #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iskiselev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed cust dynamic call sites processing #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 0 additions & 162 deletions ICSharpCode.Decompiler/DynamicCallSites.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
<Compile Include="Disassembler\ILStructure.cs" />
<Compile Include="Disassembler\MethodBodyDisassembler.cs" />
<Compile Include="Disassembler\ReflectionDisassembler.cs" />
<Compile Include="DynamicCallSites.cs" />
<Compile Include="FlowAnalysis\ControlFlowEdge.cs" />
<Compile Include="FlowAnalysis\ControlFlowGraph.cs" />
<Compile Include="FlowAnalysis\ControlFlowGraphBuilder.cs" />
Expand Down
13 changes: 1 addition & 12 deletions ICSharpCode.Decompiler/ILAst/ILAstOptimizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public enum ILAstOptimizationStep
IntroducePostIncrement,
InlineExpressionTreeParameterDeclarations,
InlineVariables2,
FindDynamicCallSites,
FindLoops,
FindConditions,
FlattenNestedMovableBlocks,
Expand Down Expand Up @@ -195,17 +194,7 @@ public void Optimize(DecompilerContext context, ILBlock method, ILAstOptimizatio
} while(modified);
}

if (abortBeforeStep == ILAstOptimizationStep.FindDynamicCallSites) return;
foreach (ILBlock block in method.GetSelfAndChildrenRecursive<ILBlock>()) {
var dcs = new DynamicCallSites(context);

bool modified;
do {
modified = block.RunOptimization(dcs.AnalyzeInstructions);
} while (modified);
}

if (abortBeforeStep == ILAstOptimizationStep.FindLoops) return;
if (abortBeforeStep == ILAstOptimizationStep.FindLoops) return;
foreach(ILBlock block in method.GetSelfAndChildrenRecursive<ILBlock>()) {
new LoopsAndConditions(context).FindLoops(block);
}
Expand Down
16 changes: 0 additions & 16 deletions ICSharpCode.Decompiler/ILAst/ILCodes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,22 +334,6 @@ public enum ILCode
/// assignments to the ParameterExpression variables.
/// </summary>
ExpressionTreeParameterDeclarations,
/// <summary>
/// Represents an invocation expression on the target of a dynamic call site.
/// </summary>
InvokeCallSiteTarget,
/// <summary>
/// Represents an expression that produces a runtime call site binder. Used as an argument to CreateCallSite.
/// </summary>
GetCallSiteBinder,
/// <summary>
/// Represents the creation of a call site and a store into its storage field.
/// </summary>
CreateCallSite,
/// <summary>
/// Represents a load of a call site from its storage field.
/// </summary>
GetCallSite,
/// <summary>
/// C# 5 await
/// </summary>
Expand Down
4 changes: 0 additions & 4 deletions ICSharpCode.Decompiler/ILAst/TypeAnalysis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,6 @@ TypeReference DoInferTypeForExpression(ILExpression expr, TypeReference expected
case ILCode.CallvirtGetter:
case ILCode.CallSetter:
case ILCode.CallvirtSetter:
case ILCode.GetCallSiteBinder:
case ILCode.InvokeCallSiteTarget:
{
MethodReference method = (MethodReference)expr.Operand;
if (forceInferChildren) {
Expand Down Expand Up @@ -362,7 +360,6 @@ TypeReference DoInferTypeForExpression(ILExpression expr, TypeReference expected
}
return GetFieldType((FieldReference)expr.Operand);
case ILCode.Ldsfld:
case ILCode.GetCallSite:
return GetFieldType((FieldReference)expr.Operand);
case ILCode.Ldflda:
if (forceInferChildren) {
Expand All @@ -378,7 +375,6 @@ TypeReference DoInferTypeForExpression(ILExpression expr, TypeReference expected
}
return GetFieldType((FieldReference)expr.Operand);
case ILCode.Stsfld:
case ILCode.CreateCallSite:
if (forceInferChildren)
InferTypeForExpression(expr.Arguments[0], GetFieldType((FieldReference)expr.Operand));
return GetFieldType((FieldReference)expr.Operand);
Expand Down