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

Fix crash with partial reference of ternary conditional operator

This commit is contained in:
drmortalwombat 2025-05-18 09:42:37 +02:00
parent 00da0ef87d
commit c1cd2ba57e
1 changed files with 73 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
oscar64/InterCodeGenerator.cpp
View File

@ -4994,64 +4994,92 @@ InterCodeGenerator::ExValue InterCodeGenerator::TranslateExpression(Declaration*
vl = TranslateExpression(procType, proc, tblock, exp->mRight->mLeft, destack, gotos, breakBlock, continueBlock, inlineMapper); vl = TranslateExpression(procType, proc, tblock, exp->mRight->mLeft, destack, gotos, breakBlock, continueBlock, inlineMapper);
vr = TranslateExpression(procType, proc, fblock, exp->mRight->mRight, destack, gotos, breakBlock, continueBlock, inlineMapper); vr = TranslateExpression(procType, proc, fblock, exp->mRight->mRight, destack, gotos, breakBlock, continueBlock, inlineMapper);
int ttemp; int ttemp, tref = 0;
InterType ttype, stypel, styper; InterType ttype;
stypel = InterTypeOf(vl.mType); Declaration* dtype = exp->mDecType;
styper = InterTypeOf(vr.mType);
Declaration* dtype; if (dtype->IsReference())
if (stypel == IT_POINTER || styper == IT_POINTER)
{ {
if (vl.mType->mType == DT_TYPE_ARRAY) vl = Dereference(proc, exp, block, inlineMapper, vl, 1);
vl = Dereference(proc, exp, tblock, inlineMapper, vl, 1); vr = Dereference(proc, exp, block, inlineMapper, vr, 1);
else tref = 1;
vl = Dereference(proc, exp, tblock, inlineMapper, vl);
if (vr.mType->mType == DT_TYPE_ARRAY)
vr = Dereference(proc, exp, fblock, inlineMapper, vr, 1);
else
vr = Dereference(proc, exp, fblock, inlineMapper, vr);
if (vl.mType->mBase->IsSubType(vr.mType->mBase))
dtype = vr.mType;
else if (vr.mType->mBase->IsSubType(vl.mType->mBase))
dtype = vl.mType;
else
{
mErrors->Error(exp->mLocation, EERR_INCOMPATIBLE_OPERATOR, "Incompatible conditional types");
dtype = vl.mType;
}
Declaration* ntype = new Declaration(dtype->mLocation, DT_TYPE_POINTER);
ntype->mBase = dtype->mBase;
dtype = ntype;
dtype = dtype->mBase;
ttype = IT_POINTER; ttype = IT_POINTER;
} }
else else
{ {
vl = Dereference(proc, exp, tblock, inlineMapper, vl); InterType stypel, styper;
vr = Dereference(proc, exp, fblock, inlineMapper, vr);
if (stypel == styper) if (vl.mType->IsReference())
{ vl = ToValue(proc, exp, block, inlineMapper, vl);
ttype = stypel; if (vr.mType->IsReference())
dtype = vl.mType; vr = ToValue(proc, exp, block, inlineMapper, vr);
}
else if (stypel > styper)
{
ttype = stypel;
dtype = vl.mType;
vr = CoerceType(proc, exp, fblock, inlineMapper, vr, dtype); stypel = InterTypeOf(vl.mType);
styper = InterTypeOf(vr.mType);
if (stypel == IT_POINTER || styper == IT_POINTER)
{
if (vl.mType->mType == DT_TYPE_ARRAY)
vl = Dereference(proc, exp, tblock, inlineMapper, vl, 1);
else
vl = Dereference(proc, exp, tblock, inlineMapper, vl);
if (vr.mType->mType == DT_TYPE_ARRAY)
vr = Dereference(proc, exp, fblock, inlineMapper, vr, 1);
else
vr = Dereference(proc, exp, fblock, inlineMapper, vr);
if (vl.mType->mBase && vr.mType->mBase)
{
if (vl.mType->mBase->IsSubType(vr.mType->mBase))
dtype = vr.mType;
else if (vr.mType->mBase->IsSubType(vl.mType->mBase))
dtype = vl.mType;
else
{
mErrors->Error(exp->mLocation, EERR_INCOMPATIBLE_OPERATOR, "Incompatible conditional types");
dtype = vl.mType;
}
}
else
{
mErrors->Error(exp->mLocation, EERR_INCOMPATIBLE_OPERATOR, "Incompatible conditional types");
dtype = vl.mType;
}
Declaration* ntype = new Declaration(dtype->mLocation, DT_TYPE_POINTER);
ntype->mBase = dtype->mBase;
dtype = ntype;
ttype = IT_POINTER;
} }
else else
{ {
ttype = styper; vl = Dereference(proc, exp, tblock, inlineMapper, vl);
dtype = vr.mType; vr = Dereference(proc, exp, fblock, inlineMapper, vr);
vl = CoerceType(proc, exp, tblock, inlineMapper, vl, dtype); if (stypel == styper)
{
ttype = stypel;
dtype = vl.mType;
}
else if (stypel > styper)
{
ttype = stypel;
dtype = vl.mType;
vr = CoerceType(proc, exp, fblock, inlineMapper, vr, dtype);
}
else
{
ttype = styper;
dtype = vr.mType;
vl = CoerceType(proc, exp, tblock, inlineMapper, vl, dtype);
}
} }
} }
@ -5103,7 +5131,7 @@ InterCodeGenerator::ExValue InterCodeGenerator::TranslateExpression(Declaration*
block = eblock; block = eblock;
return ExValue(dtype, ttemp); return ExValue(dtype, ttemp, tref);
} }
else else
{ {