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 lambda capture of shadows variables

Browse source
This commit is contained in:
Brian Fiete 2020-09-01 15:57:08 -07:00
parent 0700697fe9
commit 177b5b7254
6 changed files with 88 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

8
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -662,7 +662,7 @@ bool BfMethodInstance::HasParamsArray()
return GetParamKind((int)mParams.size() - 1) == BfParamKind_Params;
}
int BfMethodInstance::GetStructRetIdx()
int BfMethodInstance::GetStructRetIdx(bool forceStatic)
{
if ((mReturnType->IsComposite()) && (!mReturnType->IsValuelessType()) && (!GetLoweredReturnType()) && (!mIsIntrinsic))
{
@ -674,7 +674,7 @@ int BfMethodInstance::GetStructRetIdx()
if (owner->mModule->mCompiler->mOptions.mPlatformType != BfPlatformType_Windows)
return 0;
if (!HasThis())
if ((!HasThis()) || (forceStatic))
return 0;
if (!owner->IsValueType())
return 1;
@ -1014,7 +1014,7 @@ void BfMethodInstance::GetIRFunctionInfo(BfModule* module, BfIRType& returnType,
auto voidType = module->GetPrimitiveType(BfTypeCode_None);
returnType = module->mBfIRBuilder->MapType(voidType);
}
else if (GetStructRetIdx() != -1)
else if (GetStructRetIdx(forceStatic) != -1)
{
auto voidType = module->GetPrimitiveType(BfTypeCode_None);
returnType = module->mBfIRBuilder->MapType(voidType);
@ -1161,7 +1161,7 @@ void BfMethodInstance::GetIRFunctionInfo(BfModule* module, BfIRType& returnType,
_AddType(checkType2);
}
if ((GetStructRetIdx() == 1) && (!forceStatic))
if (GetStructRetIdx(forceStatic) == 1)
{
BF_SWAP(paramTypes[0], paramTypes[1]);
}