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

Fixed internal override mangling in same project

Browse source
This commit is contained in:
Brian Fiete 2020-10-26 10:47:01 -07:00
parent 84594e66ff
commit 8b74b15102
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
IDEHelper/Compiler/BfModule.cpp
View file

@ -20222,7 +20222,12 @@ void BfModule::SetupIRFunction(BfMethodInstance* methodInstance, StringImpl& man
prevFunc = mBfIRBuilder->GetFunction(mangledName); prevFunc = mBfIRBuilder->GetFunction(mangledName);
if (prevFunc) if (prevFunc)
{ {
if (methodDef->mIsExtern) if ((methodDef->mIsOverride) && (mCurTypeInstance->mTypeDef->mIsCombinedPartial))
{
BfLogSysM("Function collision from inner override erased prevFunc %p: %d\n", methodInstance, prevFunc.mId);
mBfIRBuilder->Func_EraseFromParent(prevFunc);
}
else if (methodDef->mIsExtern)
{ {
// Allow this // Allow this
BfLogSysM("Function collision allowed multiple extern functions for %p: %d\n", methodInstance, prevFunc.mId); BfLogSysM("Function collision allowed multiple extern functions for %p: %d\n", methodInstance, prevFunc.mId);
@ -20242,7 +20247,6 @@ void BfModule::SetupIRFunction(BfMethodInstance* methodInstance, StringImpl& man
else else
{ {
BfLogSysM("Function collision erased prevFunc %p: %d\n", methodInstance, prevFunc.mId); BfLogSysM("Function collision erased prevFunc %p: %d\n", methodInstance, prevFunc.mId);
mBfIRBuilder->Func_EraseFromParent(prevFunc); mBfIRBuilder->Func_EraseFromParent(prevFunc);
} }
} }