Skip to content

Support array values in custom attribute parser #3352

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
josesimoes merged 1 commit into from
May 11, 2026
+89 −0
Merged

Support array values in custom attribute parser #3352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 88 additions & 0 deletions src/CLR/Core/TypeSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9754,6 +9754,11 @@ HRESULT CLR_RT_AttributeParser::Next(Value *&res)

NanoCLRDataType dt = CLR_RT_TypeSystem::MapElementTypeToDataType(elementType);

if (dt >= DATATYPE_FIRST_INVALID)
{
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
}

dtl = c_CLR_RT_DataTypeLookup[dt];

if (dtl.m_flags & CLR_RT_DataTypeLookup::c_Numeric)
Expand All @@ -9766,6 +9771,10 @@ HRESULT CLR_RT_AttributeParser::Next(Value *&res)
{
NANOCLR_CHECK_HRESULT(ReadString(currentParam));
}
else if (dt == DATATYPE_SZARRAY)
{
NANOCLR_CHECK_HRESULT(ReadArrayValue(currentParam));
}
else
{
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
Expand Down Expand Up @@ -9797,6 +9806,15 @@ HRESULT CLR_RT_AttributeParser::Next(Value *&res)
CLR_RT_HeapBlock *currentParam = &m_lastValue.m_value;
NANOCLR_CHECK_HRESULT(ReadString(currentParam));
}
else if (m_res.DataType == DATATYPE_SZARRAY)
{
// single parameter of array type
// OK to skip element type
m_blob += sizeof(CLR_UINT8);

CLR_RT_HeapBlock *currentParam = &m_lastValue.m_value;
NANOCLR_CHECK_HRESULT(ReadArrayValue(currentParam));
}
else
{
// whatever this parameter is we don't have support for it
Expand Down Expand Up @@ -9887,6 +9905,11 @@ HRESULT CLR_RT_AttributeParser::Next(Value *&res)
CLR_RT_HeapBlock *currentParam = &m_lastValue.m_value;
NANOCLR_CHECK_HRESULT(ReadString(currentParam));
}
else if (m_res.DataType == DATATYPE_SZARRAY)
{
CLR_RT_HeapBlock *currentParam = &m_lastValue.m_value;
NANOCLR_CHECK_HRESULT(ReadArrayValue(currentParam));
}
else
{
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
Expand All @@ -9898,6 +9921,71 @@ HRESULT CLR_RT_AttributeParser::Next(Value *&res)
NANOCLR_NOCLEANUP();
}

HRESULT CLR_RT_AttributeParser::ReadArrayValue(CLR_RT_HeapBlock *&value)
{
NANOCLR_HEADER();

CLR_UINT8 elementType;
CLR_UINT8 elementCount;
const CLR_RT_DataTypeLookup *dtl;

NANOCLR_READ_UNALIGNED_UINT8(elementType, m_blob);
NANOCLR_READ_UNALIGNED_UINT8(elementCount, m_blob);

NanoCLRDataType dt = CLR_RT_TypeSystem::MapElementTypeToDataType(elementType);

if (dt >= DATATYPE_FIRST_INVALID)
{
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
}

dtl = &c_CLR_RT_DataTypeLookup[dt];

if (dtl->m_flags & CLR_RT_DataTypeLookup::c_Numeric)
{
CLR_UINT32 size = dtl->m_sizeInBytes;

NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(*value, elementCount, *dtl->m_cls));

CLR_UINT8 *arrayData = value->DereferenceArray()->GetFirstElement();

if (dt == DATATYPE_BOOLEAN)
{
for (CLR_UINT8 i = 0; i < elementCount; i++)
{
CLR_UINT8 boolValue;
NANOCLR_READ_UNALIGNED_UINT8(boolValue, m_blob);

arrayData[i] = boolValue ? 1 : 0;
}
}
else
{
memcpy(arrayData, m_blob, size * elementCount);
m_blob += size * elementCount;
}
}
else if (dt == DATATYPE_STRING)
{
NANOCLR_CHECK_HRESULT(
CLR_RT_HeapBlock_Array::CreateInstance(*value, elementCount, g_CLR_RT_WellKnownTypes.String));

auto *currentElement = (CLR_RT_HeapBlock *)value->DereferenceArray()->GetFirstElement();

for (CLR_UINT8 i = 0; i < elementCount; i++)
{
NANOCLR_CHECK_HRESULT(ReadString(currentElement));
currentElement++;
}
}
else
{
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
}

NANOCLR_NOCLEANUP();
}

HRESULT CLR_RT_AttributeParser::ReadString(CLR_RT_HeapBlock *&value)
{
NANOCLR_HEADER();
Expand Down
1 change: 1 addition & 0 deletions src/CLR/Include/nanoCLR_Runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2478,6 +2478,7 @@ struct CLR_RT_AttributeParser
const NanoCLRDataType dt,
const CLR_RT_TypeDef_Index *m_cls,
const CLR_UINT32 size);
HRESULT ReadArrayValue(CLR_RT_HeapBlock *&value);
HRESULT ReadString(CLR_RT_HeapBlock *&value);

private:
Expand Down