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

Fixed object in CreateConstant

Browse source
This commit is contained in:
Brian Fiete 2021-11-01 07:22:06 -07:00
parent 42874ed252
commit b298b232ef
1 changed files with 49 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

24
IDEHelper/Compiler/CeMachine.cpp
View file

@ -3644,6 +3644,15 @@ BfIRValue CeContext::CreateConstant(BfModule* module, uint8* ptr, BfType* bfType
// CE_CREATECONST_CHECKPTR(instData, typeInst->mInstSize); // CE_CREATECONST_CHECKPTR(instData, typeInst->mInstSize);
// } // }
if (typeInst->IsObjectOrInterface())
{
addr_ce addr = *(addr_ce*)(ptr);
if (addr == 0)
{
return irBuilder->CreateConstNull(irBuilder->MapType(typeInst));
}
instData = memStart + addr;
if (typeInst->IsInstanceOf(mCeMachine->mCompiler->mStringTypeDef)) if (typeInst->IsInstanceOf(mCeMachine->mCompiler->mStringTypeDef))
{ {
BfTypeInstance* stringTypeInst = (BfTypeInstance*)ceModule->ResolveTypeDef(mCeMachine->mCompiler->mStringTypeDef, BfPopulateType_Data); BfTypeInstance* stringTypeInst = (BfTypeInstance*)ceModule->ResolveTypeDef(mCeMachine->mCompiler->mStringTypeDef, BfPopulateType_Data);
@ -3675,7 +3684,7 @@ BfIRValue CeContext::CreateConstant(BfModule* module, uint8* ptr, BfType* bfType
CE_CREATECONST_CHECKPTR(charPtr, lenVal); CE_CREATECONST_CHECKPTR(charPtr, lenVal);
String str(charPtr, lenVal); String str(charPtr, lenVal);
return module->GetStringObjectValue(str); return module->GetStringObjectValue(str);
}
} }
if (typeInst->IsInstanceOf(mCeMachine->mCompiler->mStringViewTypeDef)) if (typeInst->IsInstanceOf(mCeMachine->mCompiler->mStringViewTypeDef))
@ -4183,7 +4192,18 @@ BfTypedValue CeContext::Call(BfAstNode* targetSrc, BfModule* module, BfMethodIns
if (success) if (success)
{ {
BfTypedValue retValue; BfTypedValue retValue;
if ((retInstAddr != 0) || (allocThisInstAddr != 0)) if (returnType->IsObject())
{
BfType* usedReturnType = returnType;
BfIRValue constVal = CreateConstant(module, (uint8*)&retInstAddr, returnType, &usedReturnType);
if (constVal)
returnValue = BfTypedValue(constVal, usedReturnType);
else
{
Fail("Failed to encode return argument");
}
}
else if ((retInstAddr != 0) || (allocThisInstAddr != 0))
{ {
auto* retPtr = memStart + retInstAddr; auto* retPtr = memStart + retInstAddr;
if (allocThisInstAddr != 0) if (allocThisInstAddr != 0)