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

Fix for boxed interface selection with multiple entries

Browse source
This commit is contained in:
Brian Fiete 2020-10-08 12:47:34 -07:00
parent 4cea33d96f
commit e0ebe81472
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
IDEHelper/Compiler/BfModule.cpp
View file

@ -5196,9 +5196,26 @@ BfIRValue BfModule::CreateTypeData(BfType* type, Dictionary<int, int>& usedStrin
_InterfaceMatchEntry* matchEntry = NULL; _InterfaceMatchEntry* matchEntry = NULL;
if (interfaceMap.TryGetValue(interfaceEntry.mInterfaceType, &matchEntry)) if (interfaceMap.TryGetValue(interfaceEntry.mInterfaceType, &matchEntry))
{ {
BfTypeInstance* compareCheckTypeInst = checkTypeInst;
if (compareCheckTypeInst->IsBoxed())
compareCheckTypeInst = compareCheckTypeInst->GetUnderlyingType()->ToTypeInstance();
BfTypeInstance* compareEntrySource = matchEntry->mEntrySource;
if (compareEntrySource->IsBoxed())
compareEntrySource = compareEntrySource->GetUnderlyingType()->ToTypeInstance();
auto prevEntry = matchEntry->mEntry; auto prevEntry = matchEntry->mEntry;
bool isBetter = TypeIsSubTypeOf(checkTypeInst, matchEntry->mEntrySource); bool isBetter = TypeIsSubTypeOf(compareCheckTypeInst, compareEntrySource);
bool isWorse = TypeIsSubTypeOf(matchEntry->mEntrySource, checkTypeInst); bool isWorse = TypeIsSubTypeOf(compareEntrySource, compareCheckTypeInst);
if ((!isBetter) && (!isWorse))
{
// Unboxed comparison to Object fix
if (compareCheckTypeInst == mContext->mBfObjectType)
isWorse = true;
else if (compareEntrySource == mContext->mBfObjectType)
isBetter = true;
}
if (forceInterfaceSet) if (forceInterfaceSet)
{ {
isBetter = true; isBetter = true;