From a874bab0e475d29149adfa8cd500ae5578269bf8 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sat, 30 Apr 2022 09:20:32 -0700 Subject: [PATCH] ResolveGenericType arg fix --- IDEHelper/Compiler/BfExprEvaluator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IDEHelper/Compiler/BfExprEvaluator.cpp b/IDEHelper/Compiler/BfExprEvaluator.cpp index 5f68c2f0..50f7c915 100644 --- a/IDEHelper/Compiler/BfExprEvaluator.cpp +++ b/IDEHelper/Compiler/BfExprEvaluator.cpp @@ -2130,7 +2130,7 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* targetTypeInstance, BfTypeInst if ((genericArgumentsSubstitute != NULL) && (wantType->IsUnspecializedType())) { wantType = typeUnspecMethodInstance->GetParamType(paramIdx); - auto resolvedType = mModule->ResolveGenericType(wantType, typeGenericArguments, genericArgumentsSubstitute, false); + auto resolvedType = mModule->ResolveGenericType(wantType, typeGenericArguments, genericArgumentsSubstitute, mModule->mCurTypeInstance, false); if (resolvedType == NULL) goto NoMatch; wantType = resolvedType; @@ -2250,7 +2250,7 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* targetTypeInstance, BfTypeInst } if ((genericArgumentsSubstitute != NULL) && (returnType->IsUnspecializedType())) { - auto resolvedType = mModule->ResolveGenericType(returnType, typeGenericArguments, genericArgumentsSubstitute, false); + auto resolvedType = mModule->ResolveGenericType(returnType, typeGenericArguments, genericArgumentsSubstitute, mModule->mCurTypeInstance, false); if (resolvedType == NULL) goto NoMatch; returnType = resolvedType;