From af4a402a5342a1ea1e558473c4f299932994e227 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Thu, 16 Dec 2021 12:06:38 -0500 Subject: [PATCH] Fixed adding emitted interfaces when no emitted code is added --- IDEHelper/Compiler/BfModuleTypeUtils.cpp | 4 ++-- IDEHelper/Compiler/CeMachine.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/IDEHelper/Compiler/BfModuleTypeUtils.cpp b/IDEHelper/Compiler/BfModuleTypeUtils.cpp index c134dc85..70fa7133 100644 --- a/IDEHelper/Compiler/BfModuleTypeUtils.cpp +++ b/IDEHelper/Compiler/BfModuleTypeUtils.cpp @@ -2201,7 +2201,7 @@ void BfModule::HandleCEAttributes(CeEmitContext* ceEmitContext, BfTypeInstance* } } } - else if (!ceEmitContext->mEmitData.IsEmpty()) + else if (ceEmitContext->HasEmissions()) { if (typeInstance->mCeTypeInfo == NULL) typeInstance->mCeTypeInfo = new BfCeTypeInfo(); @@ -2213,7 +2213,7 @@ void BfModule::HandleCEAttributes(CeEmitContext* ceEmitContext, BfTypeInstance* typeInstance->mCeTypeInfo->mNext->mTypeIFaceMap[typeId] = entry; } - if (!ceEmitContext->mEmitData.IsEmpty()) + if (ceEmitContext->HasEmissions()) { String ctxStr = "comptime ApplyToType of "; ctxStr += TypeToString(attrType); diff --git a/IDEHelper/Compiler/CeMachine.h b/IDEHelper/Compiler/CeMachine.h index 6c211e25..ca36f4b0 100644 --- a/IDEHelper/Compiler/CeMachine.h +++ b/IDEHelper/Compiler/CeMachine.h @@ -699,6 +699,11 @@ public: mMethodInstance = NULL; mFailed = false; } + + bool HasEmissions() + { + return !mEmitData.IsEmpty() || !mInterfaces.IsEmpty(); + } }; class CeContext