From 8f83d1542905d3bcd933c4833d15c6aee242c8e9 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sun, 11 Apr 2021 07:02:28 -0400 Subject: [PATCH] Null conditional var check --- IDEHelper/Compiler/BfModule.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/IDEHelper/Compiler/BfModule.cpp b/IDEHelper/Compiler/BfModule.cpp index e654e534..8a9e3447 100644 --- a/IDEHelper/Compiler/BfModule.cpp +++ b/IDEHelper/Compiler/BfModule.cpp @@ -8014,7 +8014,10 @@ BfTypedValue BfModule::FlushNullConditional(BfTypedValue result, bool ignoreNull auto pendingNullCond = mCurMethodState->mPendingNullConditional; if ((result) && (!ignoreNullable)) - { + { + if (result.mType->IsVar()) + return result; + auto notNullBB = mBfIRBuilder->GetInsertBlock(); //TODO: Make this work, needed for 'void' and such