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

Added AlwaysIncludeUser, fixed context cleanup order

Browse source
This commit is contained in:
Brian Fiete 2020-12-29 12:41:43 -08:00
parent 8dbfd1b0e3
commit 1954152a6d
9 changed files with 134 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

51
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -535,21 +535,7 @@ BfMethodInfoEx::~BfMethodInfoEx()
BfMethodInstance::~BfMethodInstance()
{
if (mMethodInstanceGroup != NULL)
{
BfLogSys(GetOwner()->mModule->mSystem, "BfMethodInstance::~BfMethodInstance %p Local:%d InCEMachine:%d\n", this, mMethodDef->mIsLocalMethod, mInCEMachine);
}
else
{
BF_ASSERT(!mMethodDef->mIsLocalMethod);
}
if (mInCEMachine)
{
auto module = GetOwner()->mModule;
if (module->mCompiler->mCEMachine != NULL)
module->mCompiler->mCEMachine->RemoveMethod(this);
}
Dispose(true);
if (mHasMethodRefType)
{
@ -561,19 +547,42 @@ BfMethodInstance::~BfMethodInstance()
}
}
delete mMethodInfoEx;
}
void BfMethodInstance::Dispose(bool isDeleting)
{
if (mIsDisposed)
return;
mIsDisposed = true;
if (mMethodInstanceGroup != NULL)
{
BfLogSys(GetOwner()->mModule->mSystem, "BfMethodInstance::~BfMethodInstance %p Local:%d InCEMachine:%d Deleting:%d\n", this, mMethodDef->mIsLocalMethod, mInCEMachine, isDeleting);
}
else
{
BF_ASSERT(!mMethodDef->mIsLocalMethod);
}
if (mInCEMachine)
{
auto module = GetOwner()->mModule;
if (module->mCompiler->mCEMachine != NULL)
module->mCompiler->mCEMachine->RemoveMethod(this);
}
if (mMethodProcessRequest != NULL)
{
BF_ASSERT(mMethodProcessRequest->mMethodInstance == this);
mMethodProcessRequest->mMethodInstance = NULL;
}
if (mHotMethod != NULL)
{
{
mHotMethod->mFlags = (BfHotDepDataFlags)(mHotMethod->mFlags & ~BfHotDepDataFlag_IsBound);
mHotMethod->Deref();
}
delete mMethodInfoEx;
}
}
void BfMethodInstance::CopyFrom(BfMethodInstance* methodInstance)
@ -2205,6 +2214,8 @@ bool BfTypeInstance::IsAlwaysInclude()
auto typeOptions = mModule->mSystem->GetTypeOptions(mTypeOptionsIdx);
typeOptions->Apply(alwaysInclude, BfOptionFlags_ReflectAlwaysIncludeType);
}
if ((mAlwaysIncludeFlags & BfAlwaysIncludeFlag_Type) != 0)
alwaysInclude = true;
return alwaysInclude;
}