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

Const null string conversion to StringView

Browse source
This commit is contained in:
Brian Fiete 2022-02-06 15:56:34 -05:00
parent 2054ea0fd8
commit 805ac997ce
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -12697,12 +12697,18 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
else if ((toType->IsInstanceOf(mCompiler->mStringViewTypeDef))) else if ((toType->IsInstanceOf(mCompiler->mStringViewTypeDef)))
{ {
int stringId = GetStringPoolIdx(typedVal.mValue, mBfIRBuilder); int stringId = GetStringPoolIdx(typedVal.mValue, mBfIRBuilder);
if (stringId >= 0) bool isNull = false;
auto constant = mBfIRBuilder->GetConstant(typedVal.mValue);
if (constant->mTypeCode == BfTypeCode_NullPtr)
isNull = true;
if ((stringId >= 0) || (isNull))
{ {
int strLen = 0; int strLen = 0;
String str; String str;
BfStringPoolEntry* entry = NULL; BfStringPoolEntry* entry = NULL;
if (mContext->mStringObjectIdMap.TryGetValue(stringId, &entry)) if ((isNull) || (mContext->mStringObjectIdMap.TryGetValue(stringId, &entry)))
{ {
auto svTypeInst = toType->ToTypeInstance(); auto svTypeInst = toType->ToTypeInstance();
@ -12710,17 +12716,26 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
PopulateType(svTypeInst->mBaseType); PopulateType(svTypeInst->mBaseType);
mBfIRBuilder->PopulateType(svTypeInst); mBfIRBuilder->PopulateType(svTypeInst);
auto stringCharPtr = GetStringCharPtr(stringId);
SizedArray<BfIRValue, 2> spanFieldVals; SizedArray<BfIRValue, 2> spanFieldVals;
spanFieldVals.Add(mBfIRBuilder->CreateConstAggZero(mBfIRBuilder->MapType(svTypeInst->mBaseType->mBaseType))); spanFieldVals.Add(mBfIRBuilder->CreateConstAggZero(mBfIRBuilder->MapType(svTypeInst->mBaseType->mBaseType)));
spanFieldVals.Add(stringCharPtr);
spanFieldVals.Add(mBfIRBuilder->CreateConst(BfTypeCode_IntPtr, entry->mString.mLength)); if (isNull)
{
spanFieldVals.Add(mBfIRBuilder->CreateConstNull());
spanFieldVals.Add(mBfIRBuilder->CreateConst(BfTypeCode_IntPtr, 0));
}
else
{
auto stringCharPtr = GetStringCharPtr(stringId);
spanFieldVals.Add(stringCharPtr);
spanFieldVals.Add(mBfIRBuilder->CreateConst(BfTypeCode_IntPtr, entry->mString.mLength));
}
SizedArray<BfIRValue, 2> svFieldVals; SizedArray<BfIRValue, 2> svFieldVals;
svFieldVals.Add(mBfIRBuilder->CreateConstAgg(mBfIRBuilder->MapType(svTypeInst->mBaseType), spanFieldVals)); svFieldVals.Add(mBfIRBuilder->CreateConstAgg(mBfIRBuilder->MapType(svTypeInst->mBaseType), spanFieldVals));
return mBfIRBuilder->CreateConstAgg(mBfIRBuilder->MapType(svTypeInst), svFieldVals); return mBfIRBuilder->CreateConstAgg(mBfIRBuilder->MapType(svTypeInst), svFieldVals);
} }
} }
} }
} }