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

Fixed deferred delete:null

Browse source
This commit is contained in:
Brian Fiete 2020-06-17 06:06:03 -07:00
parent 3378293ea9
commit 44a4702ab4
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -3843,7 +3843,7 @@ void BfModule::Visit(BfDeleteStatement* deleteStmt)
if ((!checkType->IsPointer()) && (!checkType->IsObject()))
{
Fail(StrFormat("Cannot delete a value of type '%s'", TypeToString(val.mType).c_str()), deleteStmt->mDeleteToken);
Fail(StrFormat("Cannot delete a value of type '%s'", TypeToString(val.mType).c_str()), deleteStmt->mExpression);
return;
}
@ -3996,7 +3996,12 @@ void BfModule::Visit(BfDeleteStatement* deleteStmt)
}
}
if ((customAllocator) && (customAllocator.mType != GetPrimitiveType(BfTypeCode_NullPtr)))
if (customAllocator.mType == GetPrimitiveType(BfTypeCode_NullPtr))
{
if (!checkType->IsObjectOrInterface())
Warn(0, "Type '%' has no destructor, so delete:null has no effect", deleteStmt->mExpression);
}
else if (customAllocator)
{
auto voidPtrType = GetPrimitiveType(BfTypeCode_NullPtr);
auto ptrValue = BfTypedValue(mBfIRBuilder->CreateBitCast(val.mValue, mBfIRBuilder->MapType(voidPtrType)), voidPtrType);
@ -6626,7 +6631,13 @@ void BfModule::Visit(BfDeferStatement* deferStmt)
if (isGenericParam)
return;
if (customAllocator)
bool isDtorOnly = false;
if (customAllocator.mType == GetPrimitiveType(BfTypeCode_NullPtr))
{
if (!checkType->IsObjectOrInterface())
Warn(0, "Type '%' has no destructor, so delete:null has no effect", deleteStmt->mExpression);
}
else if (customAllocator)
{
BfFunctionBindResult functionBindResult;
functionBindResult.mWantsArgs = true;
@ -6702,7 +6713,7 @@ void BfModule::Visit(BfDeferStatement* deferStmt)
auto moduleMethodInstance = GetMethodByName(internalType->ToTypeInstance(), (deleteStmt->mTargetTypeToken != NULL) ? "Dbg_ObjectPreCustomDelete" : "Dbg_ObjectPreDelete");
AddDeferredCall(moduleMethodInstance, llvmArgs, scope, deleteStmt, false, true);
}
}
}
else
{
if ((!customAllocator) && (!isAppendDelete))