From b108349a672fa52d4b555714de2e1d3d7ed37dde Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Tue, 23 Jan 2024 07:09:20 -0500 Subject: [PATCH] Fixed rettype hashing --- IDEHelper/Compiler/BfModule.cpp | 2 +- IDEHelper/Compiler/BfResolvedTypeUtils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IDEHelper/Compiler/BfModule.cpp b/IDEHelper/Compiler/BfModule.cpp index 4ee2286f..17e41cef 100644 --- a/IDEHelper/Compiler/BfModule.cpp +++ b/IDEHelper/Compiler/BfModule.cpp @@ -16537,7 +16537,7 @@ void BfModule::AssertParseErrorState() BfType* BfModule::GetDelegateReturnType(BfType* delegateType) { - BF_ASSERT(delegateType->IsDelegate()); + BF_ASSERT(delegateType->IsDelegateOrFunction()); auto typeInst = delegateType->ToTypeInstance(); PopulateType(typeInst, BfPopulateType_DataAndMethods); BfMethodInstance* invokeMethodInstance = GetRawMethodInstanceAtIdx(typeInst->ToTypeInstance(), 0, "Invoke"); diff --git a/IDEHelper/Compiler/BfResolvedTypeUtils.cpp b/IDEHelper/Compiler/BfResolvedTypeUtils.cpp index b23b8604..7c099548 100644 --- a/IDEHelper/Compiler/BfResolvedTypeUtils.cpp +++ b/IDEHelper/Compiler/BfResolvedTypeUtils.cpp @@ -3880,7 +3880,7 @@ int BfResolvedTypeSet::DoHash(BfTypeReference* typeRef, LookupContext* ctx, BfHa } if (type->IsRef()) type = type->GetUnderlyingType(); - return Hash(type, ctx, flags, hashSeed); + return DoHash(type, ctx, flags, hashSeed); } int elemHash = Hash(retTypeTypeRef->mElementType, ctx, BfHashFlag_None, hashSeed) ^ HASH_MODTYPE + retTypeTypeRef->mRetTypeToken->mToken;