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

Fixed handling of virtual methods in boxed structs

Browse source
This commit is contained in:
Brian Fiete 2020-01-15 08:34:09 -08:00
parent 7894fc73cc
commit 43d7d72f48
6 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

20
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -827,17 +827,17 @@ int BfMethodInstance::DbgGetVirtualMethodNum()
{
auto typeInst = mMethodInstanceGroup->mOwner;
int extMethodIdx = (mVirtualTableIdx - typeInst->GetBaseVTableSize()) - typeInst->GetOrigSelfVTableSize();
int extMethodIdx = (mVirtualTableIdx - typeInst->GetImplBaseVTableSize()) - typeInst->GetOrigSelfVTableSize();
if (extMethodIdx >= 0)
{
// Extension?
int vExtOfs = typeInst->GetOrigBaseVTableSize();
int vExtOfs = typeInst->GetOrigImplBaseVTableSize();
vDataVal = ((vDataIdx + vExtOfs + 1) << 20) | (extMethodIdx);
}
else
{
// Map this new virtual index back to the original index
vDataIdx += (mVirtualTableIdx - typeInst->GetBaseVTableSize()) + typeInst->GetOrigBaseVTableSize();
vDataIdx += (mVirtualTableIdx - typeInst->GetImplBaseVTableSize()) + typeInst->GetOrigImplBaseVTableSize();
}
}
else
@ -1178,20 +1178,22 @@ int BfTypeInstance::GetSelfVTableSize()
int BfTypeInstance::GetOrigSelfVTableSize()
{
if (mBaseType != NULL)
return GetOrigVTableSize() - GetOrigBaseVTableSize();
return GetOrigVTableSize() - GetOrigImplBaseVTableSize();
return GetOrigVTableSize();
}
int BfTypeInstance::GetBaseVTableSize()
int BfTypeInstance::GetImplBaseVTableSize()
{
if (mBaseType != NULL)
return mBaseType->mVirtualMethodTableSize;
auto implBase = GetImplBaseType();
if (implBase != NULL)
return implBase->mVirtualMethodTableSize;
return 0;
}
int BfTypeInstance::GetOrigBaseVTableSize()
int BfTypeInstance::GetOrigImplBaseVTableSize()
{
if (mBaseType != NULL)
auto implBase = GetImplBaseType();
if (implBase != NULL)
return mBaseType->GetOrigVTableSize();
return 0;
}