15622257744

Committed 12 Jun 2025 10:40PM UTC coverage: 34.338% (+0.03%) from 34.308%

Build # 15622257744

Build Type

Pull #472

github

Committed by

web-flow

Commit Message

Merge 87268a799 into 9ce22e911

Pull Request Pull Request #472: Handle self-referencing generic classes

Run Details

1782 of 6566 branches covered (27.14%)

Branch coverage included in aggregate %.

8 of 9 new or added lines in 3 files covered. (88.89%)

4189 of 10823 relevant lines covered (38.7%)

180993.43 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

63.33

/Cpp2IL.Core/Model/Contexts/GenericInstanceTypeAnalysisContext.cs

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Text;
using Cpp2IL.Core.Utils;
using LibCpp2IL.BinaryStructures;

namespace Cpp2IL.Core.Model.Contexts;

public class GenericInstanceTypeAnalysisContext : ReferencedTypeAnalysisContext
{
    public TypeAnalysisContext GenericType { get; }

    public List<TypeAnalysisContext> GenericArguments { get; } = [];

    public override TypeAttributes DefaultAttributes => GenericType.DefaultAttributes;

    public override TypeAttributes? OverrideAttributes { get => GenericType.OverrideAttributes; set => GenericType.OverrideAttributes = value; }

    public override string DefaultName => $"{GenericType.Name}<{string.Join(", ", GenericArguments.Select(a => a.Name))}>";

    public override string DefaultNamespace => GenericType.Namespace;

    public override TypeAnalysisContext? DefaultBaseType { get; }

    public sealed override Il2CppTypeEnum Type => Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST;

    public sealed override bool IsGenericInstance => true;

    public sealed override bool IsValueType => GenericType.IsValueType; //We don't set a definition so the default implementation cannot determine if we're a value type or not. 

    private GenericInstanceTypeAnalysisContext(Il2CppType rawType, AssemblyAnalysisContext referencedFrom) : base(referencedFrom)
    {
        // Cache this instance before resolving anything else, which might contain a reference to this instance.
        // https://github.com/SamboyCoding/Cpp2IL/issues/469
        referencedFrom.GenericInstanceTypesByIl2CppType.TryAdd(rawType, this);

        //Generic type has to be a type definition
        var gClass = rawType.GetGenericClass();
        GenericType = AppContext.ResolveContextForType(gClass.TypeDefinition) ?? throw new($"Could not resolve type {gClass.TypeDefinition.FullName} for generic instance base type");

        GenericArguments.AddRange(gClass.Context.ClassInst.Types.Select(referencedFrom.ResolveIl2CppType)!);

        SetDeclaringType();
    }

    public GenericInstanceTypeAnalysisContext(TypeAnalysisContext genericType, IEnumerable<TypeAnalysisContext> genericArguments, AssemblyAnalysisContext referencedFrom) : base(referencedFrom)
    {
        GenericType = genericType;
        GenericArguments.AddRange(genericArguments);
        DefaultBaseType = genericType.BaseType;

        SetDeclaringType();
    }

    /// <summary>
    /// Get or create a <see cref="GenericInstanceTypeAnalysisContext"/> from an <see cref="Il2CppType"/>.
    /// </summary>
    /// <param name="rawType">The underlying <see cref="Il2CppType"/>.</param>
    /// <param name="referencedFrom">The assembly that is referencing this generic instance.</param>
    /// <returns>The context for the <paramref name="rawType"/>.</returns>
    public static GenericInstanceTypeAnalysisContext GetOrCreate(Il2CppType rawType, AssemblyAnalysisContext referencedFrom)
    {
        if (rawType.Type != Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST)
            throw new ArgumentException($"Cannot create {nameof(GenericInstanceTypeAnalysisContext)} from type {rawType.Type}. Expected {Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST}.");

        if (!referencedFrom.GenericInstanceTypesByIl2CppType.TryGetValue(rawType, out var result))
        {
            result = new GenericInstanceTypeAnalysisContext(rawType, referencedFrom);
            Debug.Assert(referencedFrom.GenericInstanceTypesByIl2CppType.ContainsKey(rawType), $"The {nameof(GenericInstanceTypeAnalysisContext)} constructor should add itself to the dictionary.");
        }

        return result;
    }

    public override string GetCSharpSourceString()
    {
        var sb = new StringBuilder();

        sb.Append(GenericType.GetCSharpSourceString());
        sb.Append('<');
        var first = true;
        foreach (var genericArgument in GenericArguments)
        {
            if (!first)
                sb.Append(", ");
            else
                first = false;

            sb.Append(genericArgument.GetCSharpSourceString());
        }

        sb.Append('>');

        return sb.ToString();
    }

    private void SetDeclaringType()
    {
        var declaringType = GenericType.DeclaringType;
        if (declaringType is null)
            return;

        DeclaringType = declaringType.GenericParameters.Count == 0
            ? declaringType
            : declaringType.MakeGenericInstanceType(GenericArguments.Take(declaringType.GenericParameters.Count));
    }
}

1	using System;
2	using System.Collections.Generic;
3	using System.Diagnostics;
4	using System.Linq;
5	using System.Reflection;
6	using System.Text;
7	using Cpp2IL.Core.Utils;
8	using LibCpp2IL.BinaryStructures;
9
10	namespace Cpp2IL.Core.Model.Contexts;
11
12	public class GenericInstanceTypeAnalysisContext : ReferencedTypeAnalysisContext
13	{
14	public TypeAnalysisContext GenericType { get; }	545,865✔
15
16	public List<TypeAnalysisContext> GenericArguments { get; } = [];	1,153,221✔
17
18	public override TypeAttributes DefaultAttributes => GenericType.DefaultAttributes;	327✔
19
20	public override TypeAttributes? OverrideAttributes { get => GenericType.OverrideAttributes; set => GenericType.OverrideAttributes = value; }	327✔
21
22	public override string DefaultName => $"{GenericType.Name}<{string.Join(", ", GenericArguments.Select(a => a.Name))}>";	×
23
24	public override string DefaultNamespace => GenericType.Namespace;	×
25
26	public override TypeAnalysisContext? DefaultBaseType { get; }	65✔
27
28	public sealed override Il2CppTypeEnum Type => Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST;	×
29
30	public sealed override bool IsGenericInstance => true;	×
31
32	public sealed override bool IsValueType => GenericType.IsValueType; //We don't set a definition so the default implementation cannot determine if we're a value type or not.	8,920✔
33
34	private GenericInstanceTypeAnalysisContext(Il2CppType rawType, AssemblyAnalysisContext referencedFrom) : base(referencedFrom)	11,313✔
35	{
36	// Cache this instance before resolving anything else, which might contain a reference to this instance.
37	// https://github.com/SamboyCoding/Cpp2IL/issues/469
38	referencedFrom.GenericInstanceTypesByIl2CppType.TryAdd(rawType, this);	11,313✔
39
40	//Generic type has to be a type definition
41	var gClass = rawType.GetGenericClass();	11,313✔
42	GenericType = AppContext.ResolveContextForType(gClass.TypeDefinition) ?? throw new($"Could not resolve type {gClass.TypeDefinition.FullName} for generic instance base type");	11,313!
43
44	GenericArguments.AddRange(gClass.Context.ClassInst.Types.Select(referencedFrom.ResolveIl2CppType)!);	11,313✔
45
46	SetDeclaringType();	11,313✔
47	}	11,313✔
48
49	public GenericInstanceTypeAnalysisContext(TypeAnalysisContext genericType, IEnumerable<TypeAnalysisContext> genericArguments, AssemblyAnalysisContext referencedFrom) : base(referencedFrom)	422,826✔
50	{
51	GenericType = genericType;	422,826✔
52	GenericArguments.AddRange(genericArguments);	422,826✔
53	DefaultBaseType = genericType.BaseType;	422,826✔
54
55	SetDeclaringType();	422,826✔
56	}	422,826✔
57
58	/// <summary>
59	/// Get or create a <see cref="GenericInstanceTypeAnalysisContext"/> from an <see cref="Il2CppType"/>.
60	/// </summary>
61	/// <param name="rawType">The underlying <see cref="Il2CppType"/>.</param>
62	/// <param name="referencedFrom">The assembly that is referencing this generic instance.</param>
63	/// <returns>The context for the <paramref name="rawType"/>.</returns>
64	public static GenericInstanceTypeAnalysisContext GetOrCreate(Il2CppType rawType, AssemblyAnalysisContext referencedFrom)
65	{
66	if (rawType.Type != Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST)	108,983!
NEW 67	throw new ArgumentException($"Cannot create {nameof(GenericInstanceTypeAnalysisContext)} from type {rawType.Type}. Expected {Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST}.");	×
68
69	if (!referencedFrom.GenericInstanceTypesByIl2CppType.TryGetValue(rawType, out var result))	108,983✔
70	{
71	result = new GenericInstanceTypeAnalysisContext(rawType, referencedFrom);	11,313✔
72	Debug.Assert(referencedFrom.GenericInstanceTypesByIl2CppType.ContainsKey(rawType), $"The {nameof(GenericInstanceTypeAnalysisContext)} constructor should add itself to the dictionary.");
73	}
74
75	return result;	108,983✔
76	}
77
78	public override string GetCSharpSourceString()
79	{
80	var sb = new StringBuilder();	×
81
82	sb.Append(GenericType.GetCSharpSourceString());	×
83	sb.Append('<');	×
84	var first = true;	×
85	foreach (var genericArgument in GenericArguments)	×
86	{
87	if (!first)	×
88	sb.Append(", ");	×
89	else
90	first = false;	×
91
92	sb.Append(genericArgument.GetCSharpSourceString());	×
93	}
94
95	sb.Append('>');	×
96
97	return sb.ToString();	×
98	}
99
100	private void SetDeclaringType()
101	{
102	var declaringType = GenericType.DeclaringType;	434,139✔
103	if (declaringType is null)	434,139✔
104	return;	321,312✔
105
106	DeclaringType = declaringType.GenericParameters.Count == 0	112,827✔
107	? declaringType	112,827✔
108	: declaringType.MakeGenericInstanceType(GenericArguments.Take(declaringType.GenericParameters.Count));	112,827✔
109	}	112,827✔
110	}

SamboyCoding / Cpp2IL / 15622257744

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous