From a64e595416f1b38bcfd057851382cbe6ca79d1e4 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Thu, 17 Mar 2022 11:27:06 -0700 Subject: [PATCH] Fixed unspecialized variation assert --- IDEHelper/Compiler/BfExprEvaluator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IDEHelper/Compiler/BfExprEvaluator.cpp b/IDEHelper/Compiler/BfExprEvaluator.cpp index ede55ce6..da420183 100644 --- a/IDEHelper/Compiler/BfExprEvaluator.cpp +++ b/IDEHelper/Compiler/BfExprEvaluator.cpp @@ -3149,8 +3149,8 @@ BfType* BfExprEvaluator::BindGenericType(BfAstNode* node, BfType* bindType) if ((mBfEvalExprFlags & BfEvalExprFlags_DeclType) != 0) return bindType; - BF_ASSERT(!mModule->mCurMethodInstance->mIsUnspecializedVariation); - + BF_ASSERT((!mModule->mCurMethodInstance->mIsUnspecializedVariation) || (mModule->mIsComptimeModule)); + auto parser = node->GetSourceData()->ToParserData(); if (parser == NULL) return bindType; @@ -3158,7 +3158,7 @@ BfType* BfExprEvaluator::BindGenericType(BfAstNode* node, BfType* bindType) auto genericTypeBindings = mModule->mCurMethodState->GetRootMethodState()->mGenericTypeBindings; - if (mModule->mCurMethodInstance->mIsUnspecialized) + if ((mModule->mCurMethodInstance->mIsUnspecialized) && (!mModule->mCurMethodInstance->mIsUnspecializedVariation)) { if (!bindType->IsGenericParam()) return bindType;