Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -410,12 +410,6 @@ private void CreateNodeCaches()

_shadowConcreteMethods = new ShadowConcreteMethodHashtable(this);

_shadowConcreteUnboxingMethods = new NodeCache<MethodDesc, ShadowConcreteUnboxingThunkNode>(method =>
{
MethodDesc canonMethod = method.GetCanonMethodTarget(CanonicalFormKind.Specific);
return new ShadowConcreteUnboxingThunkNode(method, MethodEntrypoint(canonMethod, true));
});

_virtMethods = new VirtualMethodUseHashtable(this);

_variantMethods = new NodeCache<MethodDesc, VariantInterfaceMethodUseNode>((MethodDesc method) =>
Expand Down Expand Up @@ -1159,13 +1153,14 @@ public IMethodNode ExactCallableAddressTakenAddress(MethodDesc method, bool isUn
return AddressTakenMethodEntrypoint(method, isUnboxingStub);
}

public IMethodNode CanonicalEntrypoint(MethodDesc method, bool isUnboxingStub = false)
public IMethodNode CanonicalEntrypoint(MethodDesc method)
{
MethodDesc canonMethod = method.GetCanonMethodTarget(CanonicalFormKind.Specific);
if (method != canonMethod)
return ShadowConcreteMethod(method, isUnboxingStub);
if (method != canonMethod) {
return ShadowConcreteMethod(method);
}
else
return MethodEntrypoint(method, isUnboxingStub);
return MethodEntrypoint(method);
}

private NodeCache<MethodDesc, GVMDependenciesNode> _gvmDependenciesNode;
Expand Down Expand Up @@ -1284,13 +1279,9 @@ protected override ShadowConcreteMethodNode CreateValueFromKey(MethodDesc key) =
}

private ShadowConcreteMethodHashtable _shadowConcreteMethods;
private NodeCache<MethodDesc, ShadowConcreteUnboxingThunkNode> _shadowConcreteUnboxingMethods;
public IMethodNode ShadowConcreteMethod(MethodDesc method, bool isUnboxingStub = false)
public IMethodNode ShadowConcreteMethod(MethodDesc method)
{
if (isUnboxingStub)
return _shadowConcreteUnboxingMethods.GetOrAdd(method);
else
return _shadowConcreteMethods.GetOrCreateValue(method);
return _shadowConcreteMethods.GetOrCreateValue(method);
}

private static readonly string[][] s_helperEntrypointNames = new string[][] {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,6 @@
<Compile Include="Compiler\DependencyAnalysis\ModuleMetadataNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\TypeMetadataNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ScannedMethodNode.cs" />
<Compile Include="Compiler\DependencyAnalysis\ShadowConcreteUnboxingThunkNode.cs" />
<Compile Include="Compiler\ILScanner.cs" />
<Compile Include="Compiler\ILScannerBuilder.cs" />
<Compile Include="Compiler\LibraryInitializers.cs" />
Expand Down
Loading