Skip to content

Emit full 'IVectorMethods' types for lists in 'cswinrtgen' #2166

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

Merged
Sergio0694 merged 6 commits into from
Jan 16, 2026
Merged

Emit full 'IVectorMethods' types for lists in 'cswinrtgen' #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9206b37
Refactor SetAt method implementation for IList<T>
Sergio0694 Dec 22, 2025
faece82
Refactor SetAt method creation for IVector<T>
Sergio0694 Dec 22, 2025
2aebb37
Refactor InsertAt method creation for IList<T>
Sergio0694 Dec 22, 2025
fd118d9
Refactor IList<T> Append method implementation
Sergio0694 Dec 22, 2025
8172aea
Implement IndexOf method for IVector interop
Sergio0694 Dec 22, 2025
b6fc641
Add remarks on 1-based parameter indices in XML doc
Sergio0694 Dec 22, 2025
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
106 changes: 28 additions & 78 deletions src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.IList1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,107 +152,57 @@ public static void IVectorMethods(
declaration: interopReferences.IVectorMethodsImpl1GetAt(elementType).Import(module),
method: getAtMethod);

// Define the 'SetAt' method as follows:
//
// public static void SetAt(WindowsRuntimeObjectReference thisReference, uint index, <TYPE_ARGUMENT> value)
MethodDefinition setAtMethod = new(
name: "SetAt"u8,
attributes: MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Static,
signature: MethodSignature.CreateStatic(
returnType: module.CorLibTypeFactory.Void,
parameterTypes: [
interopReferences.WindowsRuntimeObjectReference.Import(module).ToReferenceTypeSignature(),
module.CorLibTypeFactory.UInt32,
elementType.Import(module)]))
{ NoInlining = true };
// Define the 'SetAt' method
MethodDefinition setAtMethod = InteropMethodDefinitionFactory.IVectorMethods.SetAt(
listType: listType,
vftblType: vftblType,
interopReferences: interopReferences,
emitState: emitState,
module: module);

// Add and implement the 'SetAt' method
vectorMethodsType.AddMethodImplementation(
declaration: interopReferences.IVectorMethodsImpl1SetAt(elementType).Import(module),
method: setAtMethod);

// Create a method body for the 'SetAt' method
setAtMethod.CilMethodBody = new CilMethodBody()
{
Instructions = { { Ldnull }, { Throw } } // TODO
};

// Define the 'Append' method as follows:
//
// public static void Append(WindowsRuntimeObjectReference thisReference, <TYPE_ARGUMENT> value)
MethodDefinition appendMethod = new(
name: "Append"u8,
attributes: MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Static,
signature: MethodSignature.CreateStatic(
returnType: module.CorLibTypeFactory.Void,
parameterTypes: [
interopReferences.WindowsRuntimeObjectReference.Import(module).ToReferenceTypeSignature(),
elementType.Import(module)]))
{ NoInlining = true };
// Define the 'Append' method
MethodDefinition appendMethod = InteropMethodDefinitionFactory.IVectorMethods.Append(
listType: listType,
vftblType: vftblType,
interopReferences: interopReferences,
emitState: emitState,
module: module);

// Add and implement the 'Append' method
vectorMethodsType.AddMethodImplementation(
declaration: interopReferences.IVectorMethodsImpl1Append(elementType).Import(module),
method: appendMethod);

// Create a method body for the 'Append' method
appendMethod.CilMethodBody = new CilMethodBody()
{
Instructions = { { Ldnull }, { Throw } } // TODO
};

// Define the 'IndexOf' method as follows:
//
// public static bool IndexOf(WindowsRuntimeObjectReference thisReference, <TYPE_ARGUMENT> value, out uint index)
MethodDefinition indexOfMethod = new(
name: "IndexOf"u8,
attributes: MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Static,
signature: MethodSignature.CreateStatic(
returnType: module.CorLibTypeFactory.Boolean,
parameterTypes: [
interopReferences.WindowsRuntimeObjectReference.Import(module).ToReferenceTypeSignature(),
elementType.Import(module),
module.CorLibTypeFactory.UInt32.MakeByReferenceType()]))
{
NoInlining = true,
CilOutParameterIndices = [3]
};
// Define the 'IndexOf' method
MethodDefinition indexOfMethod = InteropMethodDefinitionFactory.IVectorMethods.IndexOf(
listType: listType,
vftblType: vftblType,
interopReferences: interopReferences,
emitState: emitState,
module: module);

// Add and implement the 'IndexOf' method
vectorMethodsType.AddMethodImplementation(
declaration: interopReferences.IVectorMethodsImpl1IndexOf(elementType).Import(module),
method: indexOfMethod);

// Create a method body for the 'IndexOf' method
indexOfMethod.CilMethodBody = new CilMethodBody()
{
Instructions = { { Ldnull }, { Throw } } // TODO
};

// Define the 'InsertAt' method as follows:
//
// public static void InsertAt(WindowsRuntimeObjectReference thisReference, uint index, <TYPE_ARGUMENT> value)
MethodDefinition insertAtMethod = new(
name: "InsertAt"u8,
attributes: MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Static,
signature: MethodSignature.CreateStatic(
returnType: module.CorLibTypeFactory.Void,
parameterTypes: [
interopReferences.WindowsRuntimeObjectReference.Import(module).ToReferenceTypeSignature(),
module.CorLibTypeFactory.UInt32,
elementType.Import(module)]))
{ NoInlining = true };
// Define the 'InsertAt' method
MethodDefinition insertAtMethod = InteropMethodDefinitionFactory.IVectorMethods.InsertAt(
listType: listType,
vftblType: vftblType,
interopReferences: interopReferences,
emitState: emitState,
module: module);

// Add and implement the 'InsertAt' method
vectorMethodsType.AddMethodImplementation(
declaration: interopReferences.IVectorMethodsImpl1InsertAt(elementType).Import(module),
method: insertAtMethod);

// Create a method body for the 'InsertAt' method
insertAtMethod.CilMethodBody = new CilMethodBody()
{
Instructions = { { Ldnull }, { Throw } } // TODO
};
}

/// <summary>
Expand Down
4 changes: 3 additions & 1 deletion src/WinRT.Interop.Generator/Extensions/MethodDefinitionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ public static MethodDefinition CreateDefaultConstructor(ModuleDefinition module)
/// <summary>
/// Sets the indices of the parameters that are to be marshalled as <c>out</c> parameters in the CIL method body.
/// </summary>

/// <remarks>
/// Note that the indices are 1-based (as index 0 would represent the implicit <see langword="this"/> parameter).
/// </remarks>
public ReadOnlySpan<ushort> CilOutParameterIndices
{
set
Expand Down
Loading