From 4ecd7861d6178707bc7e3be90a2e089fffa109a0 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Fri, 11 Sep 2020 23:17:55 -0700 Subject: [PATCH] Allow implicit cast from function to void* --- IDEHelper/Compiler/BfModuleTypeUtils.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/IDEHelper/Compiler/BfModuleTypeUtils.cpp b/IDEHelper/Compiler/BfModuleTypeUtils.cpp index 163c7dfb..ebcdf861 100644 --- a/IDEHelper/Compiler/BfModuleTypeUtils.cpp +++ b/IDEHelper/Compiler/BfModuleTypeUtils.cpp @@ -9560,14 +9560,14 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp return mBfIRBuilder->CreateBitCast(typedVal.mValue, mBfIRBuilder->MapType(toType)); } - if (explicitCast) + // Func -> void* + if ((typedVal.mType->IsFunction()) && (toType->IsVoidPtr())) { - // Func -> void* - if ((typedVal.mType->IsFunction()) && (toType->IsVoidPtr())) - { - return mBfIRBuilder->CreateIntToPtr(typedVal.mValue, mBfIRBuilder->MapType(toType)); - } + return mBfIRBuilder->CreateIntToPtr(typedVal.mValue, mBfIRBuilder->MapType(toType)); + } + if (explicitCast) + { // void* -> Func if ((typedVal.mType->IsVoidPtr()) && (toType->IsFunction())) {