Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 20:42:21 +02:00
Code Activity

Fixed expressions block results where values could cross ScopeHardEnd

Browse source
This commit is contained in:
Brian Fiete 2021-09-11 07:34:44 -07:00
parent 4cda126188
commit 723e2177fc
2 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -3401,9 +3401,17 @@ void BfModule::VisitCodeBlock(BfBlock* block)
}
else
{
auto exprEvaluator = mCurMethodState->mCurScope->mExprEvaluator;
// Evaluate last child as an expression
mCurMethodState->mCurScope->mExprEvaluator->VisitChild(expr);
mCurMethodState->mCurScope->mExprEvaluator->FinishExpressionResult();
exprEvaluator->VisitChild(expr);
exprEvaluator->FinishExpressionResult();
if ((exprEvaluator->mResult) && (!exprEvaluator->mResult.mType->IsValuelessType()) && (!exprEvaluator->mResult.IsAddr()))
{
// We need to make sure we don't retain any values through the scope's ValueScopeHardEnd
exprEvaluator->mResult = MakeAddressable(exprEvaluator->mResult);
}
}
break;

22
IDEHelper/Tests/src/Expressions.bf Normal file
View file

@ -0,0 +1,22 @@
#pragma warning disable 168
using System;
namespace Tests
{
class Expressions
{
[Test]
public static void TestBasics()
{
int num = -1;
if ( {
var obj = scope Object();
num > 999
})
{
Test.FatalError();
}
}
}
}