frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix object array member init regression

This commit is contained in:
drmortalwombat 2024-09-15 13:00:33 +02:00
parent 163354b33e
commit f7b00eff95
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar64/NativeCodeGenerator.cpp
View File

@ -51356,7 +51356,7 @@ bool NativeCodeProcedure::MapFastParamsToTemps(void)
} }
NativeCodeBasicBlock* block = mEntryBlock; NativeCodeBasicBlock* block = mEntryBlock;
while (block && block->mIns.Size() == 0 && !block->mFalseJump) while (block && block->mIns.Size() == 0 && !block->mFalseJump && block->mTrueJump != block)
block = block->mTrueJump; block = block->mTrueJump;
if (block && block->mNumEntries == 1) if (block && block->mNumEntries == 1)

4
oscar64/Parser.cpp
View File

@ -2209,11 +2209,11 @@ void Parser::PrependMemberConstructor(Declaration* pthis, Declaration* cfunc)
} }
else else
{ {
qexp->mDecType = bdec; qexp->mDecType = dec->mBase;
dexp = new Expression(mScanner->mLocation, EX_INITIALIZATION); dexp = new Expression(mScanner->mLocation, EX_INITIALIZATION);
dexp->mToken = TK_ASSIGN; dexp->mToken = TK_ASSIGN;
dexp->mDecType = bdec; dexp->mDecType = dec->mBase;
dexp->mLeft = qexp; dexp->mLeft = qexp;
dexp->mRight = dec->mValue; dexp->mRight = dec->mValue;
} }