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

Avoid infinite recursion when coercing to base class reference

This commit is contained in:
drmortalwombat 2024-09-21 15:36:05 +02:00
parent 44a9aaf89b
commit f764cf1936
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oscar64/Parser.cpp
View File

@ -6856,8 +6856,13 @@ bool Parser::CanCoerceExpression(Expression* exp, Declaration* type)
Expression* Parser::CoerceExpression(Expression* exp, Declaration* type) Expression* Parser::CoerceExpression(Expression* exp, Declaration* type)
{ {
Declaration* tdec = exp->mDecType; Declaration* tdec = exp->mDecType;
while (tdec->mType == DT_TYPE_REFERENCE || tdec->mType == DT_TYPE_RVALUEREF) while (tdec->mType == DT_TYPE_REFERENCE || tdec->mType == DT_TYPE_RVALUEREF)
tdec = tdec->mBase; tdec = tdec->mBase;
if (type->mType == DT_TYPE_REFERENCE && type->mBase->mType == DT_TYPE_STRUCT && tdec->mType == DT_TYPE_STRUCT && type->mBase->IsSubType(tdec))
return exp;
while (type->mType == DT_TYPE_REFERENCE || type->mType == DT_TYPE_RVALUEREF) while (type->mType == DT_TYPE_REFERENCE || type->mType == DT_TYPE_RVALUEREF)
type = type->mBase; type = type->mBase;