bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed marking unevaluated subexpressions for conditional operator.

Browse Source
This commit is contained in:
acqn
2022-11-12 12:32:27 +08:00
parent 6924d44564
commit 2c3ca15d90
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/cc65/expr.c
View File

@@ -3913,17 +3913,6 @@ static void hieQuest (ExprDesc* Expr)
ED_Init (&Expr3); ED_Init (&Expr3);
Expr3.Flags = Flags; Expr3.Flags = Flags;
NextToken ();
/* Convert non-integer constant to boolean constant, so that we may just
** check it in the same way.
*/
if (ED_IsConstTrue (Expr)) {
ED_MakeConstBool (Expr, 1);
} else if (ED_IsConstFalse (Expr)) {
ED_MakeConstBool (Expr, 0);
}
if (!ConstantCond) { if (!ConstantCond) {
/* Condition codes not set, request a test */ /* Condition codes not set, request a test */
ED_RequireTest (Expr); ED_RequireTest (Expr);
@@ -3935,6 +3924,15 @@ static void hieQuest (ExprDesc* Expr)
FalseLab = GetLocalLabel (); FalseLab = GetLocalLabel ();
g_falsejump (CF_NONE, FalseLab); g_falsejump (CF_NONE, FalseLab);
} else { } else {
/* Convert non-integer constant to boolean constant, so that we
** may just check it in an easier way later.
*/
if (ED_IsConstTrue (Expr)) {
ED_MakeConstBool (Expr, 1);
} else if (ED_IsConstFalse (Expr)) {
ED_MakeConstBool (Expr, 0);
}
/* Constant boolean subexpression could still have deferred inc/dec /* Constant boolean subexpression could still have deferred inc/dec
** operations, so just flush their side-effects at this sequence point. ** operations, so just flush their side-effects at this sequence point.
*/ */
@@ -3943,9 +3941,18 @@ static void hieQuest (ExprDesc* Expr)
if (Expr->IVal == 0) { if (Expr->IVal == 0) {
/* Remember the current code position */ /* Remember the current code position */
GetCodePos (&SkippedBranch); GetCodePos (&SkippedBranch);
/* Expr2 is unevaluated when the condition is false */
Expr2.Flags |= E_EVAL_UNEVAL;
} else {
/* Expr3 is unevaluated when the condition is true */
Expr3.Flags |= E_EVAL_UNEVAL;
} }
} }
/* Skip the question mark */
NextToken ();
/* Parse second expression. Remember for later if it is a NULL pointer /* Parse second expression. Remember for later if it is a NULL pointer
** expression, then load it into the primary. ** expression, then load it into the primary.
*/ */
@@ -3977,26 +3984,22 @@ static void hieQuest (ExprDesc* Expr)
/* Jump around the evaluation of the third expression */ /* Jump around the evaluation of the third expression */
TrueLab = GetLocalLabel (); TrueLab = GetLocalLabel ();
ConsumeColon ();
g_jump (TrueLab); g_jump (TrueLab);
/* Jump here if the first expression was false */ /* Jump here if the first expression was false */
g_defcodelabel (FalseLab); g_defcodelabel (FalseLab);
} else { } else {
if (Expr->IVal == 0) { if (Expr->IVal == 0) {
/* Expr2 is unevaluated when the condition is false */
Expr2.Flags |= E_EVAL_UNEVAL;
/* Remove the load code of Expr2 */ /* Remove the load code of Expr2 */
RemoveCode (&SkippedBranch); RemoveCode (&SkippedBranch);
} else { } else {
/* Remember the current code position */ /* Remember the current code position */
GetCodePos (&SkippedBranch); GetCodePos (&SkippedBranch);
} }
ConsumeColon();
} }
ConsumeColon ();
/* Parse third expression. Remember for later if it is a NULL pointer /* Parse third expression. Remember for later if it is a NULL pointer
** expression, then load it into the primary. ** expression, then load it into the primary.
*/ */
@@ -4022,9 +4025,6 @@ static void hieQuest (ExprDesc* Expr)
Expr3.Type = PtrConversion (Expr3.Type); Expr3.Type = PtrConversion (Expr3.Type);
if (ConstantCond && Expr->IVal != 0) { if (ConstantCond && Expr->IVal != 0) {
/* Expr3 is unevaluated when the condition is true */
Expr3.Flags |= E_EVAL_UNEVAL;
/* Remove the load code of Expr3 */ /* Remove the load code of Expr3 */
RemoveCode (&SkippedBranch); RemoveCode (&SkippedBranch);
} }