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

Fixed a var-return case with generics methods specialized with var

Browse source
This commit is contained in:
Brian Fiete 2021-11-01 08:26:45 -07:00
parent 9030d86562
commit e887b2fb59
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -8903,6 +8903,8 @@ BfTypedValue BfExprEvaluator::MatchMethod(BfAstNode* targetSrc, BfMethodBoundExp
if (!moduleMethodInstance) if (!moduleMethodInstance)
{ {
FinishDeferredEvals(argValues); FinishDeferredEvals(argValues);
if (mModule->IsInUnspecializedGeneric())
return mModule->GetDefaultTypedValue(mModule->GetPrimitiveType(BfTypeCode_Var));
return BfTypedValue(); return BfTypedValue();
} }

6
IDEHelper/Compiler/BfModule.cpp
View file

@ -14146,8 +14146,10 @@ bool BfModule::IsInSpecializedSection()
bool BfModule::IsInUnspecializedGeneric() bool BfModule::IsInUnspecializedGeneric()
{ {
if (mCurMethodInstance != NULL) if ((mCurMethodInstance != NULL) && (mCurMethodInstance->mIsUnspecialized))
return mCurMethodInstance->mIsUnspecialized; return true;
if ((mCurTypeInstance != NULL) && (mCurTypeInstance->IsUnspecializedType()))
return true;
return false; return false;
} }