Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-12 21:34:11 +02:00
Code Activity

Fixed issues using object flags on on-debug default alloc

Browse source
This commit is contained in:
Brian Fiete 2020-05-15 10:33:56 -07:00
parent 66216ce5d9
commit 63c6421413
8 changed files with 50 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
IDEHelper/Compiler/BfModule.cpp
View file

@ -8120,10 +8120,20 @@ BfIRValue BfModule::AllocFromType(BfType* type, const BfAllocTarget& allocTarget
}
}
bool wasAllocated = false;
if (!result)
{
if (hasCustomAllocator)
result = AllocBytes(allocTarget.mRefNode, allocTarget, typeInstance, sizeValue, GetConstValue(typeInstance->mInstAlign), (BfAllocFlags)(BfAllocFlags_ZeroMemory | BfAllocFlags_NoDefaultToMalloc));
else if ((mCompiler->mOptions.mObjectHasDebugFlags) && (!mCompiler->mOptions.mDebugAlloc))
{
SizedArray<BfIRValue, 4> llvmArgs;
llvmArgs.push_back(sizeValue);
auto irFunc = GetBuiltInFunc(BfBuiltInFuncType_Malloc);
result = mBfIRBuilder->CreateCall(irFunc, llvmArgs);
result = mBfIRBuilder->CreateBitCast(result, mBfIRBuilder->MapTypeInstPtr(typeInstance));
wasAllocated = true;
}
}
if (result)
@ -8139,6 +8149,16 @@ BfIRValue BfModule::AllocFromType(BfType* type, const BfAllocTarget& allocTarget
(isResultInitialized ? "Dbg_ObjectCreatedEx" : "Dbg_ObjectAllocatedEx") :
(isResultInitialized ? "Dbg_ObjectCreated" : "Dbg_ObjectAllocated"));
mBfIRBuilder->CreateCall(objectCreatedMethod.mFunc, llvmArgs);
if (wasAllocated)
{
auto byteType = GetPrimitiveType(BfTypeCode_UInt8);
auto bytePtrType = CreatePointerType(byteType);
auto flagsPtr = mBfIRBuilder->CreateBitCast(result, mBfIRBuilder->MapType(bytePtrType));
auto flagsVal = mBfIRBuilder->CreateLoad(flagsPtr);
auto modifiedFlagsVal = mBfIRBuilder->CreateOr(flagsVal, mBfIRBuilder->CreateConst(BfTypeCode_UInt8, /*BF_OBJECTFLAG_ALLOCATED*/4));
mBfIRBuilder->CreateStore(modifiedFlagsVal, flagsPtr);
}
}
else
{
@ -8170,7 +8190,7 @@ BfIRValue BfModule::AllocFromType(BfType* type, const BfAllocTarget& allocTarget
else
{
SizedArray<BfIRValue, 4> llvmArgs;
llvmArgs.push_back(sizeValue);
llvmArgs.push_back(sizeValue);
BfIRFunction irFunc;
if (mCompiler->mOptions.mDebugAlloc)
{