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

Fix for valueless array allocations

Browse source
This commit is contained in:
Brian Fiete 2020-02-17 14:49:59 -08:00
parent fe531be4ef
commit 6dd49f5d9b
4 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
IDEHelper/Backend/BeIRCodeGen.cpp
View file

@ -1397,6 +1397,11 @@ void BeIRCodeGen::HandleNextCmd()
CMD_PARAM(BeType*, type); CMD_PARAM(BeType*, type);
CMD_PARAM(BeValue*, arraySize); CMD_PARAM(BeValue*, arraySize);
if (auto constant = BeValueDynCast<BeConstant>(arraySize))
{
//BF_ASSERT(constant->mInt64 >= 0);
}
auto allocaInst = mBeModule->AllocInst<BeAllocaInst>(); auto allocaInst = mBeModule->AllocInst<BeAllocaInst>();
allocaInst->mType = type; allocaInst->mType = type;
allocaInst->mAlign = type->mAlign; allocaInst->mAlign = type->mAlign;

7
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -11279,8 +11279,11 @@ void BfExprEvaluator::Visit(BfObjectCreateExpression* objCreateExpr)
} }
mModule->mBfIRBuilder->PopulateType(resultType); mModule->mBfIRBuilder->PopulateType(resultType);
mModule->mBfIRBuilder->CreateMemSet(mModule->CreateIndexedValue(resultType, addr, clearFromIdx), if (!resultType->IsValuelessType())
mModule->mBfIRBuilder->CreateConst(BfTypeCode_Int8, isUninit ? 0xCC : 0), clearBytes, resultType->mAlign); {
mModule->mBfIRBuilder->CreateMemSet(mModule->CreateIndexedValue(resultType, addr, clearFromIdx),
mModule->mBfIRBuilder->CreateConst(BfTypeCode_Int8, isUninit ? 0xCC : 0), clearBytes, resultType->mAlign);
}
} }
}; };

14
IDEHelper/Compiler/BfModule.cpp
View file

@ -7652,10 +7652,16 @@ BfIRValue BfModule::AllocFromType(BfType* type, const BfAllocTarget& allocTarget
{ {
BfArrayType* arrayType = CreateArrayType(type, arrayDim); BfArrayType* arrayType = CreateArrayType(type, arrayDim);
auto firstElementField = &arrayType->mFieldInstances.back(); auto firstElementField = &arrayType->mFieldInstances.back();
int arrayClassSize = firstElementField->mDataOffset;
sizeValue = GetConstValue(arrayClassSize); if (!type->IsValuelessType())
BfIRValue elementDataSize = mBfIRBuilder->CreateMul(GetConstValue(type->GetStride()), arraySize); {
sizeValue = mBfIRBuilder->CreateAdd(sizeValue, elementDataSize); int arrayClassSize = firstElementField->mDataOffset;
sizeValue = GetConstValue(arrayClassSize);
BfIRValue elementDataSize = mBfIRBuilder->CreateMul(GetConstValue(type->GetStride()), arraySize);
sizeValue = mBfIRBuilder->CreateAdd(sizeValue, elementDataSize);
}
else
sizeValue = GetConstValue(arrayType->mInstSize);
auto prevBlock = mBfIRBuilder->GetInsertBlock(); auto prevBlock = mBfIRBuilder->GetInsertBlock();
isDynAlloc = (isDynAlloc) || (!sizeValue.IsConst()); isDynAlloc = (isDynAlloc) || (!sizeValue.IsConst());

5
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -3324,11 +3324,6 @@ void BfModule::DoTypeInstanceMethodProcessing(BfTypeInstance* typeInstance)
BF_ASSERT(typeInstance->mInterfaceMethodTable.size() == 1); BF_ASSERT(typeInstance->mInterfaceMethodTable.size() == 1);
} }
if (typeInstance->mTypeDef == mCompiler->mPointerTypeDef)
{
NOP;
}
// Slot interfaces method blocks in vtable // Slot interfaces method blocks in vtable
{ {
int ifaceVirtIdx = 0; int ifaceVirtIdx = 0;