Skip to content

Fix signature parser usage #3215

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
merged 3 commits into from
Sep 25, 2025
Merged

Fix signature parser usage #3215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3d0def
Fix signature parser usage
josesimoes Sep 25, 2025
ea269fe
Code style fixes
nfbot Sep 25, 2025
9b5e5c2
Merge pull request #96 from nanoframework/nfbot/clang-format-fix/2c37…
josesimoes Sep 25, 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
6 changes: 3 additions & 3 deletions src/CLR/CorLib/corlib_native_System_Type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ HRESULT Library_corlib_native_System_Type::GetGenericArguments___SZARRAY_SystemT
NANOCLR_CHECK_HRESULT(parser.Advance(elem));

// get the number of generic parameters
count = parser.GenParamCount;
count = elem.GenParamCount;

// allocate an array to hold the generic arguments
NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, count, g_CLR_RT_WellKnownTypes.TypeStatic));
Expand Down Expand Up @@ -432,14 +432,14 @@ HRESULT Library_corlib_native_System_Type::get_IsGenericTypeDefinition___BOOLEAN
parser.Advance(element);

// check if it has generic parameters
if (parser.GenParamCount == 0)
if (element.GenParamCount == 0)
{
isTypeDefinition = false;
}
else
{
// keep reading the generic parameters
for (int i = 0; i < parser.GenParamCount; i++)
for (int i = 0; i < element.GenParamCount; i++)
{
if (SUCCEEDED(parser.Advance(element)))
{
Expand Down
6 changes: 3 additions & 3 deletions src/CLR/Core/Execution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2074,7 +2074,7 @@ HRESULT CLR_RT_ExecutionEngine::InitializeLocals(
varParser.Advance(varElement);

// consume parameters
for (int paramIndex = 0; paramIndex < varParser.GenParamCount; paramIndex++)
for (int paramIndex = 0; paramIndex < varElement.GenParamCount; paramIndex++)
{
NANOCLR_CHECK_HRESULT(varParser.Advance(varElement));
}
Expand All @@ -2100,15 +2100,15 @@ HRESULT CLR_RT_ExecutionEngine::InitializeLocals(
(const CLR_RT_TypeSpec_Index &)methodDefInstance.genericType->data);

typeSpec.assembly->FindGenericParamAtTypeSpec(
methodDefInstance.genericType->TypeSpec(),
methodDefInstance.genericType->data,
genericParamPosition,
cls,
dt);
}
else
{
assembly->FindGenericParamAtTypeSpec(
methodDefInstance.genericType->TypeSpec(),
methodDefInstance.genericType->data,
genericParamPosition,
cls,
dt);
Expand Down
42 changes: 22 additions & 20 deletions src/CLR/Core/TypeSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,8 +800,11 @@ bool CLR_RT_TypeSpec_Instance::ResolveToken(

NanoCLRDataType realDataType;

g_CLR_RT_TypeSystem.m_assemblies[caller->genericType->Assembly() - 1]
->FindGenericParamAtTypeSpec(closedTsRow, (CLR_UINT32)pos, cachedElementType, realDataType);
g_CLR_RT_TypeSystem.m_assemblies[caller->genericType->Assembly() - 1]->FindGenericParamAtTypeSpec(
caller->genericType->data,
(CLR_UINT32)pos,
cachedElementType,
realDataType);
}
else if (element.DataType == DATATYPE_MVAR)
{
Expand Down Expand Up @@ -1156,16 +1159,17 @@ bool CLR_RT_TypeDef_Instance::ResolveToken(
return false;
}

auto &tsi = *caller->genericType;
CLR_UINT32 closedTsRow = tsi.TypeSpec();

CLR_RT_TypeDef_Index realTypeDef;
NanoCLRDataType realDataType;

// Only call this once to map (e.g. !T→Int32)

g_CLR_RT_TypeSystem.m_assemblies[caller->genericType->Assembly() - 1]
->FindGenericParamAtTypeSpec(closedTsRow, (CLR_UINT32)pos, realTypeDef, realDataType);
->FindGenericParamAtTypeSpec(
caller->genericType->data,
(CLR_UINT32)pos,
realTypeDef,
realDataType);

// populate this instance
data = realTypeDef.data;
Expand Down Expand Up @@ -1278,14 +1282,12 @@ bool CLR_RT_TypeDef_Instance::ResolveNullableType(
return false;
}

auto &tsi = *caller->genericType;
CLR_UINT32 closedTsRow = tsi.TypeSpec();

CLR_RT_TypeDef_Index realTypeDef;
NanoCLRDataType realDataType;

// Only call this once to map (e.g. !T→Int32)
caller->assembly->FindGenericParamAtTypeSpec(closedTsRow, (CLR_UINT32)pos, realTypeDef, realDataType);
caller->assembly
->FindGenericParamAtTypeSpec(caller->genericType->data, (CLR_UINT32)pos, realTypeDef, realDataType);

// populate this instance
data = realTypeDef.data;
Expand Down Expand Up @@ -1573,7 +1575,7 @@ bool CLR_RT_MethodDef_Instance::InitializeFromIndex(
CLR_RT_TypeDef_Index realOwner;
NanoCLRDataType dummyDT;

if (!tsAsm->FindGenericParamAtTypeSpec(typeSpec.TypeSpec(), elem.GenericParamPosition, realOwner, dummyDT))
if (!tsAsm->FindGenericParamAtTypeSpec(typeSpec.data, elem.GenericParamPosition, realOwner, dummyDT))
{
return false;
}
Expand Down Expand Up @@ -1877,7 +1879,7 @@ bool CLR_RT_MethodDef_Instance::GetDeclaringType(CLR_RT_TypeDef_Instance &declTy
CLR_RT_TypeDef_Index td;
NanoCLRDataType dt;
if (tsAsm == nullptr ||
tsAsm->FindGenericParamAtTypeSpec(genericType->TypeSpec(), (CLR_UINT32)pos, td, dt) == false)
tsAsm->FindGenericParamAtTypeSpec(genericType->data, (CLR_UINT32)pos, td, dt) == false)
{
return false;
}
Expand Down Expand Up @@ -2268,7 +2270,7 @@ HRESULT CLR_RT_TypeDescriptor::InitializeFromSignatureToken(
// !T: ask the CLR to map that slot into the *actual* argument
CLR_RT_TypeDef_Index td;
NanoCLRDataType dt;
assm->FindGenericParamAtTypeSpec(caller->genericType->TypeSpec(), elem.GenericParamPosition, td, dt);
assm->FindGenericParamAtTypeSpec(caller->genericType->data, elem.GenericParamPosition, td, dt);
this->InitializeFromTypeDef(td);
}
else if (elem.DataType == DATATYPE_MVAR)
Expand Down Expand Up @@ -5090,7 +5092,7 @@ bool CLR_RT_Assembly::FindGenericParamAtTypeSpec(
}

// sanity check for invalid parameter position
if (genericParameterPosition > parser.GenParamCount)
if (genericParameterPosition > element.GenParamCount)
{
// not enough parameters!!
return false;
Expand Down Expand Up @@ -6623,14 +6625,14 @@ HRESULT CLR_RT_TypeSystem::BuildTypeName(

BuildTypeName(typeDef, szBuffer, iBuffer);

if (parser.GenParamCount > 0)
if (element.GenParamCount > 0)
{
NANOCLR_CHECK_HRESULT(QueueStringToBuffer(szBuffer, iBuffer, "<"));

closeGenericSignature = true;
}

for (int i = 0; i < parser.GenParamCount; i++)
for (int i = 0; i < element.GenParamCount; i++)
{
// read the next element (should be either VAR, MVAR, or a concrete type)
parser.Advance(element);
Expand All @@ -6643,7 +6645,7 @@ HRESULT CLR_RT_TypeSystem::BuildTypeName(

// this will bind !T→System.Int32, etc.
typeSpecInstance.assembly->FindGenericParamAtTypeSpec(
typeIndex.TypeSpec(), // closed instantiation row
typeIndex.data,
element.GenericParamPosition, // the !N slot
realTd,
realDt);
Expand All @@ -6660,7 +6662,7 @@ HRESULT CLR_RT_TypeSystem::BuildTypeName(
BuildTypeName(td, szBuffer, iBuffer);
}

if (i + 1 < parser.GenParamCount)
if (i + 1 < element.GenParamCount)
{
NANOCLR_CHECK_HRESULT(QueueStringToBuffer(szBuffer, iBuffer, ","));
}
Expand Down Expand Up @@ -6895,7 +6897,7 @@ HRESULT CLR_RT_TypeSystem::BuildMethodRefName(const CLR_RT_MethodRef_Index &meth
CLR_SafeSprintf(szBuffer, iBuffer, c_CLR_RT_DataTypeLookup[element.DataType].m_name);
#endif

if (i + 1 < parser.GenParamCount)
if (i + 1 < element.GenParamCount)
{
CLR_SafeSprintf(szBuffer, iBuffer, ",");
}
Expand Down Expand Up @@ -6979,7 +6981,7 @@ HRESULT CLR_RT_TypeSystem::BuildMethodSpecName(const CLR_RT_MethodSpec_Index &ms
NANOCLR_CHECK_HRESULT(QueueStringToBuffer(szBuffer, iBuffer, c_CLR_RT_DataTypeLookup[element.DataType].m_name));
#endif

if (i + 1 < parser.GenParamCount)
if (i + 1 < element.GenParamCount)
{
NANOCLR_CHECK_HRESULT(QueueStringToBuffer(szBuffer, iBuffer, ","));
}
Expand Down