From 72477fd2bf26aa97ddf8aa253e5dfc81f6662437 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Wed, 5 Mar 2025 15:06:19 -0800 Subject: [PATCH] Fixed null type crash during comptime circular data error --- IDEHelper/Compiler/BfModuleTypeUtils.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/IDEHelper/Compiler/BfModuleTypeUtils.cpp b/IDEHelper/Compiler/BfModuleTypeUtils.cpp index b22d7bca..9ca7e646 100644 --- a/IDEHelper/Compiler/BfModuleTypeUtils.cpp +++ b/IDEHelper/Compiler/BfModuleTypeUtils.cpp @@ -2845,6 +2845,7 @@ void BfModule::ExecuteCEOnCompile(CeEmitContext* ceEmitContext, BfTypeInstance* BfTypeState typeState; typeState.mPrevState = mContext->mCurTypeState; + typeState.mType = typeInstance; typeState.mForceActiveTypeDef = methodDef->mDeclaringType; SetAndRestoreValue prevTypeState(mContext->mCurTypeState, &typeState); @@ -2898,11 +2899,6 @@ void BfModule::ExecuteCEOnCompile(CeEmitContext* ceEmitContext, BfTypeInstance* continue; } - if (typeInstance->mTypeDef->mName->ToString() == "AssetType") - { - NOP; - } - SetAndRestoreValue prevEmitContext(mCompiler->mCeMachine->mCurEmitContext); if (onCompileKind == BfCEOnCompileKind_TypeInit) {