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 comptime debugging issue with reflect type inside aggregates

Browse source
This commit is contained in:
Brian Fiete 2025-01-24 07:18:35 -08:00
parent 6d474b31d9
commit 102cb28cb0
2 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
IDEHelper/Compiler/CeMachine.cpp
View file

@ -1736,7 +1736,7 @@ CeOperand CeBuilder::GetOperand(BeValue* value, bool allowAlloca, bool allowImme
{ {
CeConstStructData constStructData; CeConstStructData constStructData;
constStructData.mQueueFixups = true; constStructData.mQueueFixups = true;
errorKind = mCeMachine->WriteConstant(constStructData, structConstant, NULL); errorKind = mCeMachine->WriteConstant(constStructData, structConstant, NULL, this);
if (errorKind == CeErrorKind_None) if (errorKind == CeErrorKind_None)
{ {
*constDataPtr = (int)mCeFunction->mConstStructTable.size(); *constDataPtr = (int)mCeFunction->mConstStructTable.size();
@ -3901,7 +3901,7 @@ addr_ce CeContext::GetConstantData(BeConstant* constant)
} }
CeConstStructData structData; CeConstStructData structData;
auto result = mCeMachine->WriteConstant(structData, writeConstant, this); auto result = mCeMachine->WriteConstant(structData, writeConstant, this, NULL);
BF_ASSERT(result == CeErrorKind_None); BF_ASSERT(result == CeErrorKind_None);
uint8* ptr = CeMallocZero(structData.mData.mSize); uint8* ptr = CeMallocZero(structData.mData.mSize);
@ -9725,7 +9725,7 @@ void CeMachine::RemoveMethod(BfMethodInstance* methodInstance)
methodInstance->mInCEMachine = false; methodInstance->mInCEMachine = false;
} }
CeErrorKind CeMachine::WriteConstant(CeConstStructData& data, BeConstant* constVal, CeContext* ceContext) CeErrorKind CeMachine::WriteConstant(CeConstStructData& data, BeConstant* constVal, CeContext* ceContext, CeBuilder* ceBuilder)
{ {
auto ceModule = mCeModule; auto ceModule = mCeModule;
auto beType = constVal->GetType(); auto beType = constVal->GetType();
@ -9794,7 +9794,7 @@ CeErrorKind CeMachine::WriteConstant(CeConstStructData& data, BeConstant* constV
BF_ASSERT(!data.mQueueFixups); BF_ASSERT(!data.mQueueFixups);
CeConstStructData gvData; CeConstStructData gvData;
auto result = WriteConstant(gvData, globalVar->mInitializer, ceContext); auto result = WriteConstant(gvData, globalVar->mInitializer, ceContext, NULL);
if (result != CeErrorKind_None) if (result != CeErrorKind_None)
return result; return result;
@ -9806,6 +9806,19 @@ CeErrorKind CeMachine::WriteConstant(CeConstStructData& data, BeConstant* constV
memcpy(ptr, &addr64, mCeModule->mSystem->mPtrSize); memcpy(ptr, &addr64, mCeModule->mSystem->mPtrSize);
return CeErrorKind_None; return CeErrorKind_None;
} }
else if (auto beTypeOfConst = BeValueDynCast<BeTypeOfConstant>(constVal))
{
if (ceBuilder != NULL)
{
// Fake it to not break debugging
auto ptr = data.mData.GrowUninitialized(ceModule->mSystem->mPtrSize);
int64 addr64 = beTypeOfConst->mBfTypeId;
memcpy(ptr, &addr64, ceModule->mSystem->mPtrSize);
}
return CeErrorKind_None;
return CeErrorKind_Error;
}
else if (auto beFunc = BeValueDynCast<BeFunction>(constVal)) else if (auto beFunc = BeValueDynCast<BeFunction>(constVal))
{ {
return CeErrorKind_FunctionPointer; return CeErrorKind_FunctionPointer;
@ -9825,7 +9838,7 @@ CeErrorKind CeMachine::WriteConstant(CeConstStructData& data, BeConstant* constV
if (wantZeroes > 0) if (wantZeroes > 0)
data.mData.Insert(data.mData.size(), (uint8)0, wantZeroes); data.mData.Insert(data.mData.size(), (uint8)0, wantZeroes);
auto result = WriteConstant(data, constStruct->mMemberValues[memberIdx], ceContext); auto result = WriteConstant(data, constStruct->mMemberValues[memberIdx], ceContext, ceBuilder);
if (result != CeErrorKind_None) if (result != CeErrorKind_None)
return result; return result;
} }
@ -9836,7 +9849,7 @@ CeErrorKind CeMachine::WriteConstant(CeConstStructData& data, BeConstant* constV
{ {
for (auto& memberVal : constStruct->mMemberValues) for (auto& memberVal : constStruct->mMemberValues)
{ {
auto result = WriteConstant(data, memberVal, ceContext); auto result = WriteConstant(data, memberVal, ceContext, ceBuilder);
if (result != CeErrorKind_None) if (result != CeErrorKind_None)
return result; return result;
} }
@ -9850,7 +9863,7 @@ CeErrorKind CeMachine::WriteConstant(CeConstStructData& data, BeConstant* constV
} }
else if (auto constCast = BeValueDynCast<BeCastConstant>(constVal)) else if (auto constCast = BeValueDynCast<BeCastConstant>(constVal))
{ {
auto result = WriteConstant(data, constCast->mTarget, ceContext); auto result = WriteConstant(data, constCast->mTarget, ceContext, ceBuilder);
if (result != CeErrorKind_None) if (result != CeErrorKind_None)
return result; return result;
} }

2
IDEHelper/Compiler/CeMachine.h
View file

@ -1286,7 +1286,7 @@ public:
void RemoveFunc(CeFunction* ceFunction); void RemoveFunc(CeFunction* ceFunction);
void RemoveMethod(BfMethodInstance* methodInstance); void RemoveMethod(BfMethodInstance* methodInstance);
void CreateFunction(BfMethodInstance* methodInstance, CeFunction* ceFunction); void CreateFunction(BfMethodInstance* methodInstance, CeFunction* ceFunction);
CeErrorKind WriteConstant(CeConstStructData& data, BeConstant* constVal, CeContext* ceContext); CeErrorKind WriteConstant(CeConstStructData& data, BeConstant* constVal, CeContext* ceContext, CeBuilder* ceBuilder);
void CheckFunctionKind(CeFunction* ceFunction); void CheckFunctionKind(CeFunction* ceFunction);
void PrepareFunction(CeFunction* methodInstance, CeBuilder* parentBuilder); void PrepareFunction(CeFunction* methodInstance, CeBuilder* parentBuilder);