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

Fixed MapType issue with global var

Browse source
This commit is contained in:
Brian Fiete 2021-02-11 08:20:57 -08:00
parent cffd849045
commit 1c14177638
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
IDEHelper/Backend/BeIRCodeGen.cpp
View file

@ -691,6 +691,8 @@ void BeIRCodeGen::Read(BeValue*& beValue)
CMD_PARAM(String, name); CMD_PARAM(String, name);
CMD_PARAM(bool, isTLS); CMD_PARAM(bool, isTLS);
BF_ASSERT(varType != NULL);
auto globalVariable = mBeModule->mGlobalVariables.Alloc(); auto globalVariable = mBeModule->mGlobalVariables.Alloc();
globalVariable->mModule = mBeModule; globalVariable->mModule = mBeModule;
globalVariable->mType = varType; globalVariable->mType = varType;
@ -1908,6 +1910,8 @@ void BeIRCodeGen::HandleNextCmd()
CMD_PARAM(bool, isTLS); CMD_PARAM(bool, isTLS);
CMD_PARAM(BeConstant*, initializer); CMD_PARAM(BeConstant*, initializer);
BF_ASSERT(varType != NULL);
auto globalVariable = mBeModule->mGlobalVariables.Alloc(); auto globalVariable = mBeModule->mGlobalVariables.Alloc();
globalVariable->mModule = mBeModule; globalVariable->mModule = mBeModule;
globalVariable->mType = varType; globalVariable->mType = varType;

3
IDEHelper/Compiler/BfModule.cpp
View file

@ -13725,8 +13725,11 @@ BfTypedValue BfModule::ReferenceStaticField(BfFieldInstance* fieldInstance)
auto globalVar = (BfGlobalVar*)mBfIRBuilder->GetConstant(globalValue); auto globalVar = (BfGlobalVar*)mBfIRBuilder->GetConstant(globalValue);
if ((globalVar->mStreamId == -1) && (!mBfIRBuilder->mIgnoreWrites)) if ((globalVar->mStreamId == -1) && (!mBfIRBuilder->mIgnoreWrites))
{
mBfIRBuilder->MapType(fieldInstance->mResolvedType);
mBfIRBuilder->CreateGlobalVariable(globalValue); mBfIRBuilder->CreateGlobalVariable(globalValue);
} }
}
else else
{ {
StringT<128> staticVarName; StringT<128> staticVarName;