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

Fixed struct ref casts

Browse source
This commit is contained in:
Brian Fiete 2022-06-25 08:43:55 -07:00
parent e3cceff39c
commit 487787b08e
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -12597,9 +12597,11 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
// Ref X to Ref Y, X* to Y* // Ref X to Ref Y, X* to Y*
{ {
bool checkUnderlying = false; bool checkUnderlying = false;
bool isRef = false;
if (((typedVal.mType->IsRef()) && (toType->IsRef()))) if (((typedVal.mType->IsRef()) && (toType->IsRef())))
{ {
isRef = true;
auto fromRefType = (BfRefType*)typedVal.mType; auto fromRefType = (BfRefType*)typedVal.mType;
auto toRefType = (BfRefType*)toType; auto toRefType = (BfRefType*)toType;
if (fromRefType->mRefKind == toRefType->mRefKind) if (fromRefType->mRefKind == toRefType->mRefKind)
@ -12639,12 +12641,24 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
if (matches) if (matches)
{ {
// This is either a ref or a ptr so we don't need to set the "IsAddr" flag // This is either a ref or a ptr so we don't need to set the "IsAddr" flag
typedVal = MakeAddressable(typedVal); typedVal = MakeAddressable(typedVal);
return mBfIRBuilder->CreateBitCast(typedVal.mValue, mBfIRBuilder->MapType(toType)); return mBfIRBuilder->CreateBitCast(typedVal.mValue, mBfIRBuilder->MapType(toType));
} }
} }
} }
if ((isRef) && (fromInner->IsStruct()) && (toInner->IsStruct()))
{
if (TypeIsSubTypeOf(fromInner->ToTypeInstance(), toInner->ToTypeInstance()))
{
if (toInner->IsValuelessType())
return mBfIRBuilder->GetFakeVal();
// Is this valid?
typedVal = MakeAddressable(typedVal);
return mBfIRBuilder->CreateBitCast(typedVal.mValue, mBfIRBuilder->MapType(toType));
}
}
// ref int <-> ref int64/int32 (of same size) // ref int <-> ref int64/int32 (of same size)
if (((fromInner->IsInteger()) && (toInner->IsInteger())) && if (((fromInner->IsInteger()) && (toInner->IsInteger())) &&
(fromInner->mSize == toInner->mSize) && (fromInner->mSize == toInner->mSize) &&