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

Boxed struct ptr changes.

Browse source
This commit is contained in:
Brian Fiete 2019-10-09 16:16:01 -07:00
parent ad2542eba6
commit 5af6428bf4
20 changed files with 573 additions and 327 deletions
Download patch file Download diff file Expand all files Collapse all files

15
IDEHelper/Compiler/BfIRBuilder.cpp
View file

@ -1730,6 +1730,8 @@ String BfIRBuilder::GetDebugTypeName(BfTypeInstance* typeInstance, bool includeO
{
BfBoxedType* boxedType = (BfBoxedType*)typeInstance;
typeName = mModule->TypeToString(boxedType->mElementType, (BfTypeNameFlags)(BfTypeNameFlag_ResolveGenericParamNames | BfTypeNameFlag_AddGlobalContainerName));
if (boxedType->IsBoxedStructPtr())
typeName += "*";
typeName = "Box<" + typeName + ">";
}
else if (includeOuterTypeName)
@ -2547,7 +2549,7 @@ void BfIRBuilder::CreateDbgTypeDefinition(BfType* type)
}
else if (type->IsBoxed())
{
auto underlyingType = typeInstance->GetUnderlyingType();
auto underlyingType = ((BfBoxedType*)type)->GetModifiedElementType();
if (!underlyingType->IsValuelessType())
{
auto fieldInstance = &typeInstance->mFieldInstances.back();
@ -2705,9 +2707,14 @@ void BfIRBuilder::CreateTypeDefinition(BfType* type, bool forceDefine)
if (typeInstance->IsBoxed())
{
auto boxedType = (BfBoxedType*)typeInstance;
if (!boxedType->mElementType->IsValuelessType())
{
irFieldTypes.push_back(MapTypeInst(boxedType->mElementType, boxedType->mElementType->IsValueType() ? BfIRPopulateType_Eventually_Full : BfIRPopulateType_Declaration));
BF_ASSERT(!boxedType->mFieldInstances.IsEmpty());
auto& fieldInst = boxedType->mFieldInstances.back();
auto elementType = fieldInst.mResolvedType;
if (!elementType->IsValuelessType())
{
irFieldTypes.push_back(MapType(elementType, elementType->IsValueType() ? BfIRPopulateType_Eventually_Full : BfIRPopulateType_Declaration));
}
}
else