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

Reworking blockExpr value

Browse source
This commit is contained in:
Brian Fiete 2021-09-14 08:00:43 -07:00
parent f9bb9e84e7
commit 546e5f7e5e
1 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

35
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -3226,6 +3226,8 @@ void BfModule::VisitCodeBlock(BfBlock* block)
int startLocalMethod = 0; // was -1
auto rootMethodState = mCurMethodState->GetRootMethodState();
BfIRBlock startInsertBlock = mBfIRBuilder->GetInsertBlock();
bool allowLocalMethods = mCurMethodInstance != NULL;
//int startDeferredLocalIdx = (int)rootMethodState->mDeferredLocalMethods.size();
@ -3407,16 +3409,31 @@ void BfModule::VisitCodeBlock(BfBlock* block)
exprEvaluator->VisitChild(expr);
exprEvaluator->FinishExpressionResult();
if ((exprEvaluator->mResult) && (!exprEvaluator->mResult.mType->IsValuelessType()) && (!exprEvaluator->mResult.IsAddr()))
{
auto useScope = mCurMethodState->mCurScope;
if ((useScope != NULL) && (useScope->mPrevScope != NULL))
useScope = useScope->mPrevScope;
if ((exprEvaluator->mResult) && (!exprEvaluator->mResult.mType->IsValuelessType()) && (!exprEvaluator->mResult.IsAddr()) && (!exprEvaluator->mResult.mValue.IsFake()))
{
if ((mCurMethodState->mCurScope != NULL) && (mCurMethodState->mCurScope->mPrevScope != NULL))
{
// We need to make sure we don't retain any values through the scope's ValueScopeHardEnd - and extend alloca through previous scope
FixIntUnknown(exprEvaluator->mResult, exprEvaluator->mExpectingType);
// We need to make sure we don't retain any values through the scope's ValueScopeHardEnd - and extend alloca through previous scope
SetAndRestoreValue<BfScopeData*> prevScope(mCurMethodState->mCurScope, useScope);
exprEvaluator->mResult = MakeAddressable(exprEvaluator->mResult);
bool wasReadOnly = exprEvaluator->mResult.IsReadOnly();
FixIntUnknown(exprEvaluator->mResult, exprEvaluator->mExpectingType);
auto prevInsertBlock = mBfIRBuilder->GetInsertBlock();
auto tempVar = CreateAlloca(exprEvaluator->mResult.mType, false, "blockExpr");
mBfIRBuilder->SetInsertPointAtStart(startInsertBlock);
auto lifetimeStart = mBfIRBuilder->CreateLifetimeStart(tempVar);
mBfIRBuilder->ClearDebugLocation(lifetimeStart);
mCurMethodState->mCurScope->mPrevScope->mDeferredLifetimeEnds.push_back(tempVar);
mBfIRBuilder->SetInsertPoint(prevInsertBlock);
if (exprEvaluator->mResult.IsSplat())
AggregateSplatIntoAddr(exprEvaluator->mResult, tempVar);
else
mBfIRBuilder->CreateAlignedStore(exprEvaluator->mResult.mValue, tempVar, exprEvaluator->mResult.mType->mAlign);
exprEvaluator->mResult = BfTypedValue(tempVar, exprEvaluator->mResult.mType,
exprEvaluator->mResult.IsThis() ?
(wasReadOnly ? BfTypedValueKind_ReadOnlyThisAddr : BfTypedValueKind_ThisAddr) :
(wasReadOnly ? BfTypedValueKind_ReadOnlyAddr : BfTypedValueKind_Addr));
}
}
}