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

Fix crash on select statement with void result

This commit is contained in:
drmortalwombat 2024-09-20 13:26:59 +02:00
parent 2f5faaa5ab
commit 5d7dcf9373
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
oscar64/InterCodeGenerator.cpp
View File

@ -4828,31 +4828,46 @@ InterCodeGenerator::ExValue InterCodeGenerator::TranslateExpression(Declaration*
} }
} }
ttemp = proc->AddTemporary(ttype); if (ttype != IT_NONE)
{
ttemp = proc->AddTemporary(ttype);
InterInstruction* rins = new InterInstruction(MapLocation(exp, inlineMapper), IC_LOAD_TEMPORARY); InterInstruction* rins = new InterInstruction(MapLocation(exp, inlineMapper), IC_LOAD_TEMPORARY);
rins->mSrc[0].mType = ttype; rins->mSrc[0].mType = ttype;
rins->mSrc[0].mTemp = vr.mTemp; rins->mSrc[0].mTemp = vr.mTemp;
rins->mDst.mType = ttype; rins->mDst.mType = ttype;
rins->mDst.mTemp = ttemp; rins->mDst.mTemp = ttemp;
fblock->Append(rins); fblock->Append(rins);
InterInstruction* lins = new InterInstruction(MapLocation(exp, inlineMapper), IC_LOAD_TEMPORARY); InterInstruction* lins = new InterInstruction(MapLocation(exp, inlineMapper), IC_LOAD_TEMPORARY);
lins->mSrc[0].mType = ttype; lins->mSrc[0].mType = ttype;
lins->mSrc[0].mTemp = vl.mTemp; lins->mSrc[0].mTemp = vl.mTemp;
lins->mDst.mType = ttype; lins->mDst.mType = ttype;
lins->mDst.mTemp = ttemp; lins->mDst.mTemp = ttemp;
tblock->Append(lins); tblock->Append(lins);
tblock->Append(jins0); tblock->Append(jins0);
tblock->Close(eblock, nullptr); tblock->Close(eblock, nullptr);
fblock->Append(jins1); fblock->Append(jins1);
fblock->Close(eblock, nullptr); fblock->Close(eblock, nullptr);
block = eblock; block = eblock;
return ExValue(dtype, ttemp); return ExValue(dtype, ttemp);
}
else
{
tblock->Append(jins0);
tblock->Close(eblock, nullptr);
fblock->Append(jins1);
fblock->Close(eblock, nullptr);
block = eblock;
return ExValue();
}
} }
break; break;