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

Fixed resolve-only property devirtualize check

Browse source
This commit is contained in:
Brian Fiete 2020-06-20 05:19:28 -07:00
parent 156d8413ed
commit e865e675a7
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -14638,13 +14638,18 @@ BfModuleMethodInstance BfExprEvaluator::GetPropertyMethodInstance(BfMethodDef* m
else else
{ {
auto propTypeInst = mPropTarget.mType->ToTypeInstance(); auto propTypeInst = mPropTarget.mType->ToTypeInstance();
mModule->PopulateType(propTypeInst, BfPopulateType_DataAndMethods);
auto rawMethodInstance = mModule->GetRawMethodInstance(propTypeInst, methodDef); auto rawMethodInstance = mModule->GetRawMethodInstance(propTypeInst, methodDef);
BF_ASSERT(rawMethodInstance->mVirtualTableIdx != -1);
if (rawMethodInstance->mVirtualTableIdx == -1) if (rawMethodInstance->mVirtualTableIdx == -1)
{ {
if (!mModule->mCompiler->mIsResolveOnly)
{
// ResolveOnly does not force methods to slot
BF_ASSERT(rawMethodInstance->mVirtualTableIdx != -1);
mModule->Fail(StrFormat("Failed to devirtualize %s", mModule->MethodToString(rawMethodInstance).c_str())); mModule->Fail(StrFormat("Failed to devirtualize %s", mModule->MethodToString(rawMethodInstance).c_str()));
} }
}
else else
{ {
auto useTypeInst = mOrigPropTarget.mType->ToTypeInstance(); auto useTypeInst = mOrigPropTarget.mType->ToTypeInstance();