Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7a3eaba
Convert COMCustomAttribute from MDCS to UCO
am11 Apr 4, 2026
f3e9b82
Address Aaron's feedback
am11 Apr 5, 2026
3e6efe5
Address Jan's feedback
am11 Apr 5, 2026
d7f8b33
Use emitted thunks in RuntimeMethodHandle.InvokeMethod
am11 Apr 5, 2026
be9dddc
Revert reflection stack for benchmarks
am11 Apr 5, 2026
31de3bf
Revert to 3e6efe5703f39d39934caeea5d123fd7e927bb5c
am11 Apr 9, 2026
2d313da
Merge dotnet/main into feature/MDCS-to-UCOA-pattern
am11 Apr 9, 2026
75cb0c4
Merge branch 'main' into feature/MDCS-to-UCOA-pattern
am11 Apr 10, 2026
954af8a
Remove CallDescrWorkerWith from InvokeMethod path
am11 Apr 11, 2026
3baf854
Merge dotnet/main into feature/MDCS-to-UCOA-pattern
am11 Apr 11, 2026
aa0da9d
Fix mono
am11 Apr 11, 2026
a981f2d
Update callhelpers-reverse for wasm
am11 Apr 11, 2026
da967a9
Fix mono condition
am11 Apr 11, 2026
53679e0
Skip arg slot fixup for ref-likes
am11 Apr 11, 2026
0ba9e63
Merge branch 'main' into feature/MDCS-to-UCOA-pattern
am11 Apr 11, 2026
a575025
Dedups
am11 Apr 12, 2026
86d0bd6
Merge dotnet/main into feature/MDCS-to-UCOA-pattern
am11 Apr 12, 2026
05af3bd
Exclude mono
am11 Apr 12, 2026
0eb1889
Restore comment
am11 Apr 12, 2026
2378b88
Cleanups
am11 Apr 12, 2026
6dd7e5d
More cleanups
am11 Apr 12, 2026
b26c6ae
Merge branch 'main' into feature/MDCS-to-UCOA-pattern
am11 Apr 12, 2026
0a8c91b
Merge branch 'main' into feature/MDCS-to-UCOA-pattern
jkotas May 17, 2026
552671a
Port and adapt Steve's 115345 changes
am11 May 18, 2026
dea74f6
Merge dotnet/main into feature/MDCS-to-UCOA-pattern
am11 May 19, 2026
8ea3398
Improve caching
am11 May 19, 2026
a06e0be
Merge branch 'main' into feature/MDCS-to-UCOA-pattern
am11 May 19, 2026
95b2a2f
Merge dotnet/main into feature/MDCS-to-UCOA-pattern
am11 May 19, 2026
24a5a1f
Remove RequiresUnsafe (cleaned up in main branch)
am11 May 20, 2026
ef06e02
Merge branch 'main' into feature/MDCS-to-UCOA-pattern
am11 May 20, 2026
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
Prev Previous commit
Next Next commit
Address Aaron's feedback
  • Loading branch information
am11 committed Apr 5, 2026
commit f3e9b8205522643d6c3053c9bb658181bcb91825
Original file line number Diff line number Diff line change
Expand Up @@ -1866,7 +1866,7 @@ private static unsafe void InvokeCustomAttributeCtor(NativeCtorInvokeContract* p
try
{
object?[]? parameters = *pContract->CtorArgs;
byte[]? argIsValueType = *pContract->ArgIsValueType;
bool[]? argIsValueType = *pContract->ArgIsValueType;
object? target = *pContract->CtorTarget;

int argCount = pContract->ArgCount;
Expand All @@ -1882,9 +1882,9 @@ private static unsafe void InvokeCustomAttributeCtor(NativeCtorInvokeContract* p

object ctorTarget = target;
object?[] ctorArgs = parameters;
byte[] argIsValueTypeFlags = argIsValueType;
bool[] argIsValueTypeFlags = argIsValueType;

if (pContract->CtorEntryPoint == IntPtr.Zero)
if (pContract->CtorEntryPoint == null)
{
throw new InvalidOperationException("Invalid constructor entry point.");
}
Expand All @@ -1899,7 +1899,7 @@ private static unsafe void InvokeCustomAttributeCtor(NativeCtorInvokeContract* p
if (argCount == 1)
{
object? arg0 = ctorArgs[0];
if (argIsValueTypeFlags[0] == 0)
if (!argIsValueTypeFlags[0])
{
InstanceCalliHelper.Call((delegate*<object, object?, void>)pContract->CtorEntryPoint, ctorTarget, arg0);
}
Expand Down Expand Up @@ -1968,20 +1968,20 @@ private static unsafe void InvokeCustomAttributeCtor(NativeCtorInvokeContract* p
bool hasValueTypeArg = false;
for (int i = 0; i < argCount; i++)
{
if (argIsValueTypeFlags[i] != 0)
if (argIsValueTypeFlags[i])
{
hasValueTypeArg = true;
}
}

if (hasValueTypeArg)
{
if (pContract->CtorInvokeStubEntryPoint == IntPtr.Zero)
if (pContract->CtorInvokeStubEntryPoint == null)
{
throw new InvalidOperationException("Invalid constructor invoke stub entry point.");
}

((delegate*<object, object?[], IntPtr, void>)pContract->CtorInvokeStubEntryPoint)(ctorTarget, ctorArgs, pContract->CtorEntryPoint);
((delegate*<object, object?[], void*, void>)pContract->CtorInvokeStubEntryPoint)(ctorTarget, ctorArgs, pContract->CtorEntryPoint);
*pResult = ctorTarget;
return;
}
Expand Down Expand Up @@ -2009,12 +2009,12 @@ private static unsafe void InvokeCustomAttributeCtor(NativeCtorInvokeContract* p
return;
}

if (pContract->CtorInvokeStubEntryPoint == IntPtr.Zero)
if (pContract->CtorInvokeStubEntryPoint == null)
{
throw new InvalidOperationException("Invalid constructor invoke stub entry point.");
}

((delegate*<object, object?[], IntPtr, void>)pContract->CtorInvokeStubEntryPoint)(ctorTarget, ctorArgs, pContract->CtorEntryPoint);
((delegate*<object, object?[], void*, void>)pContract->CtorInvokeStubEntryPoint)(ctorTarget, ctorArgs, pContract->CtorEntryPoint);
*pResult = ctorTarget;
return;
}
Expand All @@ -2028,11 +2028,11 @@ private static unsafe void InvokeCustomAttributeCtor(NativeCtorInvokeContract* p
private unsafe struct NativeCtorInvokeContract
{
public object[]* CtorArgs;
public byte[]* ArgIsValueType;
public bool[]* ArgIsValueType;
public int ArgCount;
public object* CtorTarget;
public IntPtr CtorEntryPoint;
public IntPtr CtorInvokeStubEntryPoint;
public void* CtorEntryPoint;
public void* CtorInvokeStubEntryPoint;
}

[LibraryImport(RuntimeHelpers.QCall, EntryPoint = "CustomAttribute_CreateCustomAttributeInstance")]
Expand Down
23 changes: 10 additions & 13 deletions src/coreclr/vm/customattribute.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1046,24 +1046,22 @@ extern "C" void QCALLTYPE CustomAttribute_CreateCustomAttributeInstance(

struct
Comment thread
am11 marked this conversation as resolved.
Resolved
{
OBJECTREF ctorArgs;
OBJECTREF ctorArgIsValueTypeFlags;
OBJECTREF ctorArgsObj;
PTRARRAYREF ctorArgs;
BOOLARRAYREF ctorArgIsValueTypeFlags;
OBJECTREF ctorTarget;
OBJECTREF ctorResult;
} gc;
gc.ctorArgs = NULL;
gc.ctorArgIsValueTypeFlags = NULL;
gc.ctorArgsObj = NULL;
gc.ctorTarget = NULL;
gc.ctorResult = NULL;
GCPROTECT_BEGIN(gc);

gc.ctorArgs = (OBJECTREF)AllocateObjectArray(cArgs, g_pObjectClass);
gc.ctorArgIsValueTypeFlags = (OBJECTREF)(U1ARRAYREF)AllocatePrimitiveArray(ELEMENT_TYPE_U1, cArgs);
gc.ctorArgs = (PTRARRAYREF)AllocateObjectArray(cArgs, g_pObjectClass);
gc.ctorArgIsValueTypeFlags = (BOOLARRAYREF)AllocatePrimitiveArray(ELEMENT_TYPE_BOOLEAN, cArgs);
gc.ctorTarget = th.GetMethodTable()->Allocate();

BYTE* argIsValueTypeFlags = ((U1ARRAYREF)gc.ctorArgIsValueTypeFlags)->GetDataPtr();
CLR_BOOL* argIsValueTypeFlags = reinterpret_cast<CLR_BOOL*>(static_cast<void*>(gc.ctorArgIsValueTypeFlags->GetDataPtr()));

if (pBlob)
{
Expand Down Expand Up @@ -1094,7 +1092,7 @@ extern "C" void QCALLTYPE CustomAttribute_CreateCustomAttributeInstance(
if (argTypeForParse.IsArray())
argTypeForParse = argTypeForParse.GetArrayElementTypeHandle();

argIsValueTypeFlags[i] = paramType.IsValueType() ? 1 : 0;
argIsValueTypeFlags[i] = CLR_BOOL_ARG(paramType.IsValueType());

ARG_SLOT data = GetDataFromBlob(
pCtorMD->GetAssembly(),
Expand All @@ -1120,7 +1118,7 @@ extern "C" void QCALLTYPE CustomAttribute_CreateCustomAttributeInstance(
argObj = pMTValue->Box((void*)ArgSlotEndiannessFixup(&data, pMTValue->GetNumInstanceFieldBytes()));
}

((PTRARRAYREF)gc.ctorArgs)->SetAt(i, argObj);
gc.ctorArgs->SetAt(i, argObj);
}

// Reset signature enumeration before we leave argument processing.
Expand Down Expand Up @@ -1164,21 +1162,20 @@ extern "C" void QCALLTYPE CustomAttribute_CreateCustomAttributeInstance(
}
}

gc.ctorArgsObj = gc.ctorArgs;
PCODE ctorEntryPoint = pCtorMD->GetSingleCallableAddrOfCode();
PCODE ctorInvokeStubEntryPoint = needsCtorInvokeStub ? GetOrCreateCustomAttributeCtorInvokeStub(pCtorMD, th) : (PCODE)NULL;

struct NativeCtorInvokeContract
{
OBJECTREF* ctorArgs;
OBJECTREF* argIsValueType;
PTRARRAYREF* ctorArgs;
BOOLARRAYREF* argIsValueType;
INT32 argCount;
OBJECTREF* ctorTarget;
PCODE ctorEntryPoint;
PCODE ctorInvokeStubEntryPoint;
} contract;

contract.ctorArgs = &gc.ctorArgsObj;
contract.ctorArgs = &gc.ctorArgs;
contract.argIsValueType = &gc.ctorArgIsValueTypeFlags;
contract.argCount = (INT32)cArgs;
contract.ctorTarget = &gc.ctorTarget;
Expand Down