From c73cf12f5e31563ba4642531c9a433cc8b6814df Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Mon, 16 May 2022 10:56:20 -0700 Subject: [PATCH] Type deletion protection in mPopulateTypeWorkList --- IDEHelper/Compiler/BfCompiler.cpp | 5 ++--- IDEHelper/Compiler/BfContext.cpp | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IDEHelper/Compiler/BfCompiler.cpp b/IDEHelper/Compiler/BfCompiler.cpp index 67f41fe7..d0525cc0 100644 --- a/IDEHelper/Compiler/BfCompiler.cpp +++ b/IDEHelper/Compiler/BfCompiler.cpp @@ -9927,9 +9927,8 @@ BF_EXPORT const char* BF_CALLTYPE BfCompiler_GetCollapseRegions(BfCompiler* bfCo else { int dollarPos = (int)emitParser->mFileName.LastIndexOf('$'); - if (dollarPos == -1) - return -1; - outString += emitParser->mFileName.Substring(dollarPos + 1); + if (dollarPos != -1) + outString += emitParser->mFileName.Substring(dollarPos + 1); } outString += "\n"; } diff --git a/IDEHelper/Compiler/BfContext.cpp b/IDEHelper/Compiler/BfContext.cpp index c98b22e9..ccfb931b 100644 --- a/IDEHelper/Compiler/BfContext.cpp +++ b/IDEHelper/Compiler/BfContext.cpp @@ -464,7 +464,8 @@ bool BfContext::ProcessWorkList(bool onlyReifiedTypes, bool onlyReifiedMethods) else useModule = mUnreifiedModule; } - useModule->PopulateType(type, BfPopulateType_Full); + if (!type->IsDeleting()) + useModule->PopulateType(type, BfPopulateType_Full); mCompiler->mStats.mQueuedTypesProcessed++; mCompiler->UpdateCompletion(); didWork = true;