diff options
Diffstat (limited to 'src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/GenericDictionaryNode.cs')
| -rw-r--r-- | src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/GenericDictionaryNode.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/GenericDictionaryNode.cs b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/GenericDictionaryNode.cs index 8ebdfa051..211ac3a1f 100644 --- a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/GenericDictionaryNode.cs +++ b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/GenericDictionaryNode.cs @@ -86,9 +86,9 @@ namespace ILCompiler.DependencyAnalysis return this.GetMangledName(factory.NameMangler); } - int ISortableSymbolNode.ClassCode => ClassCode; + public override int ClassCode => ClassCode; - int ISortableSymbolNode.CompareToImpl(ISortableSymbolNode other, CompilerComparer comparer) + public override int CompareToImpl(ISortableNode other, CompilerComparer comparer) { return CompareToImpl((ObjectNode)other, comparer); } @@ -134,11 +134,11 @@ namespace ILCompiler.DependencyAnalysis foreach (var arg in _owningType.Instantiation) { // Skip types that do not have a default constructor (not interesting). - if (arg.IsValueType || arg.GetDefaultConstructor() == null) + if (arg.IsValueType || arg.GetDefaultConstructor() == null || !ConstructedEETypeNode.CreationAllowed(arg)) continue; result.Add(new DependencyListEntry( - factory.DefaultConstructorFromLazy(arg.ConvertToCanonForm(CanonicalFormKind.Specific)), + factory.ConstructedTypeSymbol(arg.ConvertToCanonForm(CanonicalFormKind.Specific)), "Default constructor for lazy generics")); } } @@ -176,9 +176,9 @@ namespace ILCompiler.DependencyAnalysis _owningType = owningType; } - protected internal override int ClassCode => 889700584; + public override int ClassCode => 889700584; - protected internal override int CompareToImpl(SortableDependencyNode other, CompilerComparer comparer) + public override int CompareToImpl(ISortableNode other, CompilerComparer comparer) { return comparer.Compare(_owningType, ((TypeGenericDictionaryNode)other)._owningType); } @@ -218,21 +218,21 @@ namespace ILCompiler.DependencyAnalysis foreach (var arg in _owningMethod.OwningType.Instantiation) { // Skip types that do not have a default constructor (not interesting). - if (arg.IsValueType || arg.GetDefaultConstructor() == null) + if (arg.IsValueType || arg.GetDefaultConstructor() == null || !ConstructedEETypeNode.CreationAllowed(arg)) continue; dependencies.Add(new DependencyListEntry( - factory.DefaultConstructorFromLazy(arg.ConvertToCanonForm(CanonicalFormKind.Specific)), + factory.ConstructedTypeSymbol(arg.ConvertToCanonForm(CanonicalFormKind.Specific)), "Default constructor for lazy generics")); } foreach (var arg in _owningMethod.Instantiation) { // Skip types that do not have a default constructor (not interesting). - if (arg.IsValueType || arg.GetDefaultConstructor() == null) + if (arg.IsValueType || arg.GetDefaultConstructor() == null || !ConstructedEETypeNode.CreationAllowed(arg)) continue; dependencies.Add(new DependencyListEntry( - factory.DefaultConstructorFromLazy(arg.ConvertToCanonForm(CanonicalFormKind.Specific)), + factory.ConstructedTypeSymbol(arg.ConvertToCanonForm(CanonicalFormKind.Specific)), "Default constructor for lazy generics")); } } @@ -277,9 +277,9 @@ namespace ILCompiler.DependencyAnalysis _owningMethod = owningMethod; } - protected internal override int ClassCode => -1245704203; + public override int ClassCode => -1245704203; - protected internal override int CompareToImpl(SortableDependencyNode other, CompilerComparer comparer) + public override int CompareToImpl(ISortableNode other, CompilerComparer comparer) { return comparer.Compare(_owningMethod, ((MethodGenericDictionaryNode)other)._owningMethod); } |