Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 03:52:19 +02:00
Code Activity

Concrete type size fix

Browse source
This commit is contained in:
Brian Fiete 2021-01-22 05:52:49 -08:00
parent 9ccdf7282e
commit 9df5442a37
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -1284,8 +1284,8 @@ void BfModule::PopulateType(BfType* resolvedTypeRef, BfPopulateType populateType
{
BfConcreteInterfaceType* concreteInterfaceType = (BfConcreteInterfaceType*)resolvedTypeRef;
BF_ASSERT(concreteInterfaceType->mInterface->IsInterface());
resolvedTypeRef->mSize = concreteInterfaceType->mInterface->mSize;
resolvedTypeRef->mAlign = concreteInterfaceType->mInterface->mAlign;
resolvedTypeRef->mSize = mContext->mBfObjectType->mSize;
resolvedTypeRef->mAlign = mContext->mBfObjectType->mAlign;
resolvedTypeRef->mDefineState = BfTypeDefineState_Defined;
return;
}
@ -11850,17 +11850,21 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
auto castedFromValue = Cast(srcNode, typedVal, bestFromType, castFlags);
if (!castedFromValue)
return BfIRValue();
BfTypedValue operatorOut;
if (ignoreWrites)
{
{
if (opMethodInstance != NULL)
exprEvaluator.PerformCallChecks(opMethodInstance, srcNode);
if (returnType == toType)
return mBfIRBuilder->GetFakeVal();
return mBfIRBuilder->GetFakeVal();
operatorOut = GetDefaultTypedValue(returnType);
}
else
{
BfModuleMethodInstance moduleMethodInstance = GetMethodInstance(opMethodInstance->GetOwner(), opMethodInstance->mMethodDef, BfTypeVector());
exprEvaluator.PerformCallChecks(moduleMethodInstance.mMethodInstance, srcNode);
SizedArray<BfIRValue, 1> args;
exprEvaluator.PushArg(castedFromValue, args);