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

Fixed hotswap error zeroing libs, fixed indexer type lookup errors

This commit is contained in:
Brian Fiete 2020-04-13 06:41:54 -07:00
parent e2a6a122c4
commit 766b274426
4 changed files with 30 additions and 23 deletions

View file

@ -19350,7 +19350,6 @@ void BfModule::DoMethodDeclaration(BfMethodDeclaration* methodDeclaration, bool
bool wasGenericParam = false;
if (resolvedParamType == NULL)
{
SetAndRestoreValue<bool> prevIngoreErrors(mIgnoreErrors, mIgnoreErrors || (methodDef->GetPropertyDeclaration() != NULL));
resolvedParamType = ResolveTypeRef(paramDef->mTypeRef, BfPopulateType_Declaration,
(BfResolveTypeRefFlags)(BfResolveTypeRefFlag_NoResolveGenericParam | BfResolveTypeRefFlag_AllowRef | BfResolveTypeRefFlag_AllowRefGeneric | BfResolveTypeRefFlag_AllowGenericMethodParamConstValue));
}
@ -21011,7 +21010,8 @@ bool BfModule::Finish()
mCompiler->mStats.mConstBytes += mBfIRBuilder->mTempAlloc.GetAllocSize();
bool allowWriteToLib = true;
if ((allowWriteToLib) && (codeGenOptions.mOptLevel == BfOptLevel_OgPlus) && (mModuleName != "vdata"))
if ((allowWriteToLib) && (codeGenOptions.mOptLevel == BfOptLevel_OgPlus) &&
(!mCompiler->IsHotCompile()) && (mModuleName != "vdata"))
{
codeGenOptions.mWriteToLib = true;
mWroteToLib = true;
@ -21065,15 +21065,9 @@ bool BfModule::Finish()
if (mCompiler->IsHotCompile())
{
codeGenOptions.mIsHotCompile = true;
//TODO: Why did we have this 'mWroteToLib' check? 'vdata' didn't get this flag set, which
// is required for rebuilding vdata after we hot create a vdata
//if (mWroteToLib)
{
if (mParentModule != NULL)
mParentModule->mHadHotObjectWrites = true;
mHadHotObjectWrites = true;
}
if (mParentModule != NULL)
mParentModule->mHadHotObjectWrites = true;
mHadHotObjectWrites = true;
}