From 2c009297515954741a2d32b419efd3847e160e37 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Mon, 30 Nov 2020 06:22:37 -0800 Subject: [PATCH] Fixed invalid FinishInit call during ignored method declaration --- IDEHelper/Compiler/BfModule.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IDEHelper/Compiler/BfModule.cpp b/IDEHelper/Compiler/BfModule.cpp index 0633b655..3e22c50a 100644 --- a/IDEHelper/Compiler/BfModule.cpp +++ b/IDEHelper/Compiler/BfModule.cpp @@ -3774,7 +3774,7 @@ void BfModule::ResolveConstField(BfTypeInstance* typeInstance, BfFieldInstance* } if ((constValue) && (fieldInstance->mConstIdx == -1)) - { + { SetAndRestoreValue prevTypeInstance(mCurTypeInstance, typeInstance); CurrentAddToConstHolder(constValue); fieldInstance->mConstIdx = constValue.mId; @@ -20518,8 +20518,8 @@ void BfModule::DoMethodDeclaration(BfMethodDeclaration* methodDeclaration, bool BF_ASSERT(mContext->mResolvingVarField); isTemporaryFunc = true; } - - if (mAwaitingInitFinish) + + if ((mAwaitingInitFinish) && (!mBfIRBuilder->mIgnoreWrites)) FinishInit(); auto typeInstance = mCurTypeInstance;