mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-10 12:32:20 +02:00
Improved "const" handling of local variable when referencing globals
This commit is contained in:
parent
989e8455e8
commit
e7a966c1b5
3 changed files with 7 additions and 27 deletions
|
@ -4340,31 +4340,7 @@ BfTypedValue BfExprEvaluator::LoadLocal(BfLocalVariable* varDecl, bool allowRef)
|
|||
}
|
||||
else if (varDecl->mConstValue)
|
||||
{
|
||||
localResult = BfTypedValue(varDecl->mConstValue, varDecl->mResolvedType, false);
|
||||
|
||||
if ((varDecl->mResolvedType->IsRef()) && (!allowRef))
|
||||
{
|
||||
BfRefType* refType = (BfRefType*)varDecl->mResolvedType;
|
||||
BfType* innerType = refType->mElementType;
|
||||
|
||||
if (innerType->IsValuelessNonOpaqueType())
|
||||
{
|
||||
if (refType->mRefKind == BfRefType::RefKind_Mut)
|
||||
return BfTypedValue(mModule->mBfIRBuilder->GetFakeVal(), innerType, BfTypedValueKind_MutableValue);
|
||||
return BfTypedValue(mModule->mBfIRBuilder->GetFakeVal(), innerType, varDecl->mIsReadOnly ? BfTypedValueKind_ReadOnlyAddr : BfTypedValueKind_Addr);
|
||||
}
|
||||
|
||||
if (refType->mRefKind == BfRefType::RefKind_Mut)
|
||||
{
|
||||
if (innerType->IsGenericParam())
|
||||
{
|
||||
localResult = BfTypedValue(varDecl->mConstValue, innerType, BfTypedValueKind_MutableValue);
|
||||
return localResult;
|
||||
}
|
||||
}
|
||||
|
||||
localResult = BfTypedValue(varDecl->mConstValue, innerType, varDecl->mIsReadOnly ? BfTypedValueKind_ReadOnlyAddr : BfTypedValueKind_Addr);
|
||||
}
|
||||
localResult = BfTypedValue(varDecl->mConstValue, varDecl->mResolvedType, false);
|
||||
}
|
||||
else if (varDecl->mIsSplat)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue