Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 19:48:20 +02:00
Code Activity

Fixed field dependency on methodRefs

Browse source
This commit is contained in:
Brian Fiete 2021-12-28 06:03:52 -05:00
parent e81c0d6dfa
commit 98eb8f5840
2 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -704,23 +704,13 @@ void BfModule::InitType(BfType* resolvedTypeRef, BfPopulateType populateType)
void BfModule::AddFieldDependency(BfTypeInstance* typeInstance, BfFieldInstance* fieldInstance, BfType* fieldType) void BfModule::AddFieldDependency(BfTypeInstance* typeInstance, BfFieldInstance* fieldInstance, BfType* fieldType)
{ {
auto fieldTypeInstance = fieldType->ToTypeInstance(); auto depFlag = fieldType->IsValueType() ? BfDependencyMap::DependencyFlag_ValueTypeMemberData : BfDependencyMap::DependencyFlag_PtrMemberData;
AddDependency(fieldType, typeInstance, depFlag);
if (fieldTypeInstance == NULL) if ((fieldType->IsStruct()) && (fieldType->IsGenericTypeInstance()))
{
auto underlyingType = fieldType->GetUnderlyingType();
if (underlyingType != NULL)
AddFieldDependency(typeInstance, fieldInstance, underlyingType);
return;
}
auto depFlag = fieldTypeInstance->IsValueType() ? BfDependencyMap::DependencyFlag_ValueTypeMemberData : BfDependencyMap::DependencyFlag_PtrMemberData;
AddDependency(fieldTypeInstance, typeInstance, depFlag);
if ((fieldTypeInstance->IsStruct()) && (fieldTypeInstance->IsGenericTypeInstance()))
{ {
// When we're a generic struct, our data layout can depend on our generic parameters as well // When we're a generic struct, our data layout can depend on our generic parameters as well
auto genericTypeInstance = (BfTypeInstance*)fieldTypeInstance; auto genericTypeInstance = (BfTypeInstance*)fieldType;
for (auto typeGenericArg : genericTypeInstance->mGenericTypeInfo->mTypeGenericArguments) for (auto typeGenericArg : genericTypeInstance->mGenericTypeInfo->mTypeGenericArguments)
AddFieldDependency(typeInstance, fieldInstance, typeGenericArg); AddFieldDependency(typeInstance, fieldInstance, typeGenericArg);
} }

2
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -2664,6 +2664,8 @@ int BfArrayType::GetLengthBitCount()
int BfMethodRefType::GetCaptureDataCount() int BfMethodRefType::GetCaptureDataCount()
{ {
if (mMethodRef == NULL)
return 0;
return (int)mDataToParamIdx.size(); return (int)mDataToParamIdx.size();
} }