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

Removed mDtorDef, fixed MethodSpecializationRequest on emitted method

Browse source
This commit is contained in:
Brian Fiete 2021-01-11 10:52:44 -08:00
parent 71d4dd0e90
commit bc8758bbac
7 changed files with 71 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

22
IDEHelper/Compiler/BfSystem.cpp
View file

@ -2669,8 +2669,7 @@ void BfSystem::InjectNewRevision(BfTypeDef* typeDef)
methodDef->mCodeChanged = true;
nextMethodDef->mParams.Clear();
nextMethodDef->mGenericParams.Clear();
}
// Leave typeDef->mDtorDef
}
}
else
{
@ -2685,8 +2684,7 @@ void BfSystem::InjectNewRevision(BfTypeDef* typeDef)
if (setDeclaringType)
for (auto method : typeDef->mMethods)
method->mDeclaringType = typeDef;
nextTypeDef->mMethods.Clear();
typeDef->mDtorDef = nextTypeDef->mDtorDef;
nextTypeDef->mMethods.Clear();
}
for (auto fieldDef : typeDef->mFields)
@ -2970,18 +2968,7 @@ void BfSystem::AddToCompositePartial(BfPassInstance* passInstance, BfTypeDef* co
typeDef->mProperties.push_back(newProp);
}
typeDef->mPropertySet.Clear();
if (partialTypeDef->mDtorDef != NULL)
{
if (typeDef->mDtorDef != NULL)
{
//passInstance->Fail("Destructor already defined", partialTypeDef->mDtorDef->mMethodDeclaration->mNameNode);
//TODO:
}
else
typeDef->mDtorDef = partialTypeDef->mDtorDef;
}
BF_ASSERT(partialTypeDef->mPartials.empty());
partialTypeDef->mPartialIdx = (int)typeDef->mPartials.size();
typeDef->mPartials.push_back(partialTypeDef);
@ -3100,8 +3087,7 @@ void BfSystem::FinishCompositePartial(BfTypeDef* compositeTypeDef)
}
if ((allHasMethods[0][0].mDtor == 0) && (allHasMethods[1][0].mDtor > 1))
{
nextRevision->mDtorDef = NULL;
{
auto methodDef = BfDefBuilder::AddMethod(nextRevision, BfMethodType_Dtor, BfProtection_Public, false, "");
methodDef->mDeclaringType = primaryDef;
}