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

proper fix

This commit is contained in:
EinBurgbauer 2021-05-20 18:16:55 +02:00
parent 10c8196352
commit 954992b9d4

View file

@ -1209,7 +1209,6 @@ void BfMethodInstance::GetIRFunctionInfo(BfModule* module, BfIRType& returnType,
returnType = module->mBfIRBuilder->MapType(mReturnType); returnType = module->mBfIRBuilder->MapType(mReturnType);
} }
bool hasExplicitThis = false;
for (int paramIdx = -1; paramIdx < GetParamCount(); paramIdx++) for (int paramIdx = -1; paramIdx < GetParamCount(); paramIdx++)
{ {
BfType* checkType = NULL; BfType* checkType = NULL;
@ -1224,23 +1223,15 @@ void BfMethodInstance::GetIRFunctionInfo(BfModule* module, BfIRType& returnType,
else else
{ {
if (HasExplicitThis()) if (HasExplicitThis())
{
checkType = GetParamType(0); checkType = GetParamType(0);
hasExplicitThis = true;
}
else else
checkType = GetOwner(); checkType = GetOwner();
} }
} }
else else
{ {
if (hasExplicitThis && paramIdx == 0) if ((paramIdx == 0) && (mMethodDef->mHasExplicitThis))
{ continue; // Skip over the explicit 'this'
// We already looked at this
hasExplicitThis = false;
continue;
}
checkType = GetParamType(paramIdx); checkType = GetParamType(paramIdx);
} }
@ -1354,9 +1345,6 @@ void BfMethodInstance::GetIRFunctionInfo(BfModule* module, BfIRType& returnType,
if (checkType2 != NULL) if (checkType2 != NULL)
_AddType(checkType2); _AddType(checkType2);
if ((paramIdx == -1) && (mMethodDef->mHasExplicitThis))
paramIdx++; // Skip over the explicit 'this'
} }
if ((!module->mIsComptimeModule) && (GetStructRetIdx(forceStatic) == 1)) if ((!module->mIsComptimeModule) && (GetStructRetIdx(forceStatic) == 1))