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

Fixed crash when using a failed closure

Browse source
This commit is contained in:
Brian Fiete 2020-02-28 11:12:21 -08:00
parent c92bc523db
commit bb34a468bb
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -464,7 +464,7 @@ bool BfMethodMatcher::InferGenericArgument(BfMethodInstance* methodInstance, BfT
auto argInvokeMethod = mModule->GetRawMethodByName(argType->ToTypeInstance(), "Invoke");
auto wantInvokeMethod = mModule->GetRawMethodByName(wantType->ToTypeInstance(), "Invoke");
if (argInvokeMethod->GetParamCount() == wantInvokeMethod->GetParamCount())
if ((argInvokeMethod != NULL) && (wantInvokeMethod != NULL) && (argInvokeMethod->GetParamCount() == wantInvokeMethod->GetParamCount()))
{
InferGenericArgument(methodInstance, argInvokeMethod->mReturnType, wantInvokeMethod->mReturnType, BfIRValue(), checkedTypeSet);
for (int argIdx = 0; argIdx < (int)argInvokeMethod->GetParamCount(); argIdx++)
@ -9604,13 +9604,13 @@ BfLambdaInstance* BfExprEvaluator::GetLambdaInstance(BfLambdaBindExpression* lam
sBindCount++;
bool isFunctionBind = false;
BfTypeInstance* delegateTypeInstance = NULL;
BfMethodInstance* invokeMethodInstance = NULL;
if (mExpectingType == NULL)
{
mModule->Fail("Cannot infer delegate type", lambdaBindExpr);
delegateTypeInstance = mModule->mContext->mBfObjectType;
delegateTypeInstance = mModule->ResolveTypeDef(mModule->mCompiler->mActionTypeDef)->ToTypeInstance();
}
else
{
@ -9620,7 +9620,7 @@ BfLambdaInstance* BfExprEvaluator::GetLambdaInstance(BfLambdaBindExpression* lam
{
if (lambdaBindExpr->mFatArrowToken != NULL)
mModule->Fail("Can only bind lambdas to delegate types", lambdaBindExpr->mFatArrowToken);
delegateTypeInstance = mModule->mContext->mBfObjectType;
delegateTypeInstance = mModule->ResolveTypeDef(mModule->mCompiler->mActionTypeDef)->ToTypeInstance();
}
else
{