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

Fixed indexing of const multi-dim arrays

Browse source
This commit is contained in:
Brian Fiete 2025-02-03 08:20:35 -08:00
parent e0529caee0
commit 60fdfff8d7
1 changed files with 40 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

66
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -22653,6 +22653,8 @@ void BfExprEvaluator::HandleIndexerExpression(BfIndexerExpression* indexerExpr,
if ((!target.IsAddr()) && (!target.mType->IsSizeAligned()))
mModule->MakeAddressable(target);
mResult = BfTypedValue();
mModule->PopulateType(underlyingType);
if ((sizedArrayType->IsUndefSizedArray()) || (isUndefIndex))
{
@ -22669,6 +22671,40 @@ void BfExprEvaluator::HandleIndexerExpression(BfIndexerExpression* indexerExpr,
}
else if (target.IsAddr())
{
// Handle below
}
else
{
if ((!target.mValue.IsConst()) && (!indexArgument.mValue.IsConst()))
{
target = mModule->MakeAddressable(target);
}
else
{
mModule->mBfIRBuilder->PopulateType(target.mType);
auto gepResult = mModule->mBfIRBuilder->CreateExtractValue(target.mValue, indexArgument.mValue);
if ((underlyingType->IsString()) || (underlyingType->IsPointer()))
{
auto resultConst = mModule->mBfIRBuilder->GetConstant(gepResult);
if ((resultConst != NULL) && (resultConst->mTypeCode == BfTypeCode_Int32))
{
int strId = resultConst->mInt32;
const StringImpl& str = mModule->mContext->mStringObjectIdMap[strId].mString;
if (underlyingType->IsString())
gepResult = mModule->GetStringObjectValue(str, false);
else
gepResult = mModule->GetStringCharPtr(strId);
}
}
mResult = BfTypedValue(gepResult, underlyingType, BfTypedValueKind_Value);
}
}
if ((!mResult) && (target.IsAddr()))
{
if (target.mType->IsSizeAligned())
{
auto gepResult = mModule->mBfIRBuilder->CreateInBoundsGEP(target.mValue, mModule->GetConstValue(0), indexArgument.mValue);
@ -22680,33 +22716,11 @@ void BfExprEvaluator::HandleIndexerExpression(BfIndexerExpression* indexerExpr,
mResult = BfTypedValue(indexResult, underlyingType, target.IsReadOnly() ? BfTypedValueKind_ReadOnlyAddr : BfTypedValueKind_Addr);
}
}
else
if (!mResult)
{
if ((!target.mValue.IsConst()) && (!indexArgument.mValue.IsConst()))
{
mModule->Fail("Unable to index value", indexerExpr->mTarget);
return;
}
mModule->mBfIRBuilder->PopulateType(target.mType);
auto gepResult = mModule->mBfIRBuilder->CreateExtractValue(target.mValue, indexArgument.mValue);
if ((underlyingType->IsString()) || (underlyingType->IsPointer()))
{
auto resultConst = mModule->mBfIRBuilder->GetConstant(gepResult);
if ((resultConst != NULL) && (resultConst->mTypeCode == BfTypeCode_Int32))
{
int strId = resultConst->mInt32;
const StringImpl& str = mModule->mContext->mStringObjectIdMap[strId].mString;
if (underlyingType->IsString())
gepResult = mModule->GetStringObjectValue(str, false);
else
gepResult = mModule->GetStringCharPtr(strId);
}
}
mResult = BfTypedValue(gepResult, underlyingType, BfTypedValueKind_Value);
mModule->Fail("Unable to index value", indexerExpr->mTarget);
return;
}
}
else