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 out variable lifetimes, further unified out var for case+method

Browse source
This commit is contained in:
Brian Fiete 2025-02-23 10:26:05 -08:00
parent 2bf2173e86
commit 35739e7293
4 changed files with 76 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

49
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -7750,12 +7750,9 @@ void BfExprEvaluator::FinishDeferredEvals(BfResolvedArgs& argValues)
localVar->Init();
mModule->AddLocalVariableDef(localVar, true);
auto curScope = mModule->mCurMethodState->mCurScope;
auto curScope = mModule->mCurMethodState->mCurScope;
if (curScope->mScopeKind == BfScopeKind_StatementTarget)
{
// Move this variable into the parent scope
curScope->mLocalVarStart = (int)mModule->mCurMethodState->mLocals.size();
}
mModule->MoveLocalToParentScope(localVar);
}
}
}
@ -9331,47 +9328,7 @@ BfTypedValue BfExprEvaluator::ResolveArgValue(BfResolvedArg& resolvedArg, BfType
mModule->CreateValueFromExpression(variableDeclaration->mInitializer, variableType, BfEvalExprFlags_NoCast);
}
BfLocalVariable* localVar = new BfLocalVariable();
if ((variableDeclaration != NULL) && (variableDeclaration->mNameNode != NULL))
{
localVar->mName = variableDeclaration->mNameNode->ToString();
localVar->mNameNode = BfNodeDynCast<BfIdentifierNode>(variableDeclaration->mNameNode);
}
else
{
if (paramNameNode != NULL)
{
localVar->mName = "__";
paramNameNode->ToString(localVar->mName);
localVar->mName += "_";
localVar->mName += StrFormat("%d", mModule->mCurMethodState->GetRootMethodState()->mCurLocalVarId);
}
else
localVar->mName = "__" + StrFormat("%d", mModule->mCurMethodState->GetRootMethodState()->mCurLocalVarId);
}
localVar->mResolvedType = variableType;
mModule->PopulateType(variableType);
if (!variableType->IsValuelessType())
localVar->mAddr = mModule->CreateAlloca(variableType);
localVar->mIsReadOnly = isLet;
localVar->mReadFromId = 0;
localVar->mWrittenToId = 0;
localVar->mAssignedKind = BfLocalVarAssignKind_Unconditional;
mModule->CheckVariableDef(localVar);
localVar->Init();
mModule->AddLocalVariableDef(localVar, true);
CheckVariableDeclaration(resolvedArg.mExpression, false, false, false);
argValue = BfTypedValue(localVar->mAddr, mModule->CreateRefType(variableType, BfRefType::RefKind_Out));
auto curScope = mModule->mCurMethodState->mCurScope;
if (curScope->mScopeKind == BfScopeKind_StatementTarget)
{
// Move this variable into the parent scope
curScope->mLocalVarStart = (int)mModule->mCurMethodState->mLocals.size();
}
argValue = mModule->CreateOutVariable(resolvedArg.mExpression, variableDeclaration, paramNameNode, variableType, BfTypedValue());
}
return argValue;
}

68
IDEHelper/Compiler/BfModule.cpp
View file

@ -16039,6 +16039,74 @@ BfIRValue BfModule::AllocLocalVariable(BfType* type, const StringImpl& name, boo
return allocaInst;
}
BfTypedValue BfModule::CreateOutVariable(BfAstNode* refNode, BfVariableDeclaration* variableDeclaration, BfAstNode* paramNameNode, BfType* variableType, BfTypedValue initValue)
{
bool isLet = (variableDeclaration != NULL) && (variableDeclaration->mTypeRef->IsExact<BfLetTypeReference>());
bool isVar = (variableDeclaration == NULL) || (variableDeclaration->mTypeRef->IsExact<BfVarTypeReference>());
BfLocalVariable* localVar = new BfLocalVariable();
if ((variableDeclaration != NULL) && (variableDeclaration->mNameNode != NULL))
{
localVar->mName = variableDeclaration->mNameNode->ToString();
localVar->mNameNode = BfNodeDynCast<BfIdentifierNode>(variableDeclaration->mNameNode);
}
else
{
if (paramNameNode != NULL)
{
localVar->mName = "__";
paramNameNode->ToString(localVar->mName);
localVar->mName += "_";
localVar->mName += StrFormat("%d", mCurMethodState->GetRootMethodState()->mCurLocalVarId);
}
else
localVar->mName = "__" + StrFormat("%d", mCurMethodState->GetRootMethodState()->mCurLocalVarId);
}
localVar->mResolvedType = variableType;
PopulateType(variableType);
if (!variableType->IsValuelessType())
localVar->mAddr = CreateAlloca(variableType);
localVar->mIsReadOnly = isLet;
localVar->mReadFromId = 0;
localVar->mWrittenToId = 0;
localVar->mAssignedKind = BfLocalVarAssignKind_Unconditional;
CheckVariableDef(localVar);
localVar->Init();
AddLocalVariableDef(localVar, true);
BfExprEvaluator exprEvaluator(this);
exprEvaluator.CheckVariableDeclaration(refNode, false, false, false);
auto argValue = BfTypedValue(localVar->mAddr, CreateRefType(variableType, BfRefType::RefKind_Out));
initValue = LoadOrAggregateValue(initValue);
if ((initValue) && (!initValue.mType->IsValuelessType()))
mBfIRBuilder->CreateStore(initValue.mValue, localVar->mAddr);
auto curScope = mCurMethodState->mCurScope;
if (curScope->mScopeKind == BfScopeKind_StatementTarget)
MoveLocalToParentScope(localVar);
return argValue;
}
void BfModule::MoveLocalToParentScope(BfLocalVariable* localVar)
{
auto curScope = mCurMethodState->mCurScope;
if (mCurMethodState->mLocals.back() != localVar)
return;
curScope->mLocalVarStart = (int)mCurMethodState->mLocals.size();
if ((!curScope->mDeferredLifetimeEnds.IsEmpty()) && (curScope->mDeferredLifetimeEnds.back() == localVar->mAddr))
{
curScope->mDeferredLifetimeEnds.pop_back();
if (curScope->mPrevScope != NULL)
curScope->mPrevScope->mDeferredLifetimeEnds.push_back(localVar->mAddr);
}
}
void BfModule::DoAddLocalVariable(BfLocalVariable* localVar)
{
BF_ASSERT(localVar->mResolvedType != NULL);

2
IDEHelper/Compiler/BfModule.h
View file

@ -1928,6 +1928,8 @@ public:
String GenericParamSourceToString(const BfGenericParamSource& genericParamSource);
bool CheckGenericConstraints(const BfGenericParamSource& genericParamSource, BfType* checkArgType, BfAstNode* checkArgTypeRef, BfGenericParamInstance* genericParamInst, BfTypeVector* methodGenericArgs = NULL, BfError** errorOut = NULL);
BfIRValue AllocLocalVariable(BfType* type, const StringImpl& name, bool doLifetimeEnd = true);
BfTypedValue CreateOutVariable(BfAstNode* refNode, BfVariableDeclaration* variableDeclaration, BfAstNode* paramNameNode, BfType* variableType, BfTypedValue initValue);
void MoveLocalToParentScope(BfLocalVariable* localVar);
void DoAddLocalVariable(BfLocalVariable* localVar);
void FixLocalVariable(BfLocalVariable* localVar);
void DoLocalVariableDebugInfo(BfLocalVariable* localVar, bool doAliasValue = false, BfIRValue declareBefore = BfIRValue(), BfIRInitType initType = BfIRInitType_NotSet);

16
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -2438,16 +2438,9 @@ void BfModule::HandleCaseEnumMatch_Tuple(BfTypedValue tupleVal, const BfSizedArr
if (prevHadFallthrough)
Fail("Destructuring cannot be used when the previous case contains a fallthrough", expr);
CreateOutVariable(expr, varDecl, NULL, tupleElement.mType, tupleElement);
auto localVar = HandleVariableDeclaration(varDecl, tupleElement, false, true);
localVar->mReadFromId = 0; // Don't give usage errors for binds
auto curScope = mCurMethodState->mCurScope;
if (curScope->mScopeKind == BfScopeKind_StatementTarget)
{
// Move this variable into the parent scope
curScope->mLocalVarStart = localVar->mLocalVarIdx + 1;
}
continue;
}
@ -2473,10 +2466,7 @@ void BfModule::HandleCaseEnumMatch_Tuple(BfTypedValue tupleVal, const BfSizedArr
localVar->mReadFromId = 0; // Don't give usage errors for binds
auto curScope = mCurMethodState->mCurScope;
if (curScope->mScopeKind == BfScopeKind_StatementTarget)
{
// Move this variable into the parent scope
curScope->mLocalVarStart = localVar->mLocalVarIdx + 1;
}
MoveLocalToParentScope(localVar);
continue;
}
}