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

Ternary fix for some obscure cases.

Browse Source
This commit is contained in:
acqn
2021-03-14 02:39:40 +08:00
committed by Oliver Schmidt
parent 7d528d9eb0
commit a51d6d40de
1 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/cc65/expr.c
View File

@@ -3987,24 +3987,24 @@ static void hieQuest (ExprDesc* Expr)
*/ */
ExprWithCheck (hie1, &Expr2); ExprWithCheck (hie1, &Expr2);
Expr2IsNULL = ED_IsNullPtr (&Expr2); Expr2IsNULL = ED_IsNullPtr (&Expr2);
if (!IsTypeVoid (Expr2.Type)) { if (!IsTypeVoid (Expr2.Type) &&
if (!ConstantCond || !ED_IsConst (&Expr2)) { ED_YetToLoad (&Expr2) &&
/* Load it into the primary */ (!ConstantCond || !ED_IsConst (&Expr2))) {
LoadExpr (CF_NONE, &Expr2); /* Load it into the primary */
LoadExpr (CF_NONE, &Expr2);
/* Append deferred inc/dec at sequence point */ /* Append deferred inc/dec at sequence point */
DoDeferred (SQP_KEEP_EXPR, &Expr2); DoDeferred (SQP_KEEP_EXPR, &Expr2);
ED_FinalizeRValLoad (&Expr2); ED_FinalizeRValLoad (&Expr2);
} else { } else {
/* Constant boolean subexpression could still have deferred inc/ /* Constant boolean subexpression could still have deferred inc/
** dec operations, so just flush their side-effects at this ** dec operations, so just flush their side-effects at this
** sequence point. ** sequence point.
*/ */
DoDeferred (SQP_KEEP_NONE, &Expr2); DoDeferred (SQP_KEEP_NONE, &Expr2);
}
Expr2.Type = PtrConversion (Expr2.Type);
} }
Expr2.Type = PtrConversion (Expr2.Type);
if (!ConstantCond) { if (!ConstantCond) {
/* Remember the current code position */ /* Remember the current code position */
@@ -4021,6 +4021,9 @@ static void hieQuest (ExprDesc* Expr)
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 {
@@ -4035,26 +4038,29 @@ static void hieQuest (ExprDesc* Expr)
*/ */
ExprWithCheck (hie1, &Expr3); ExprWithCheck (hie1, &Expr3);
Expr3IsNULL = ED_IsNullPtr (&Expr3); Expr3IsNULL = ED_IsNullPtr (&Expr3);
if (!IsTypeVoid (Expr3.Type)) { if (!IsTypeVoid (Expr3.Type) &&
if (!ConstantCond || !ED_IsConst (&Expr3)) { ED_YetToLoad (&Expr3) &&
/* Load it into the primary */ (!ConstantCond || !ED_IsConst (&Expr3))) {
LoadExpr (CF_NONE, &Expr3); /* Load it into the primary */
LoadExpr (CF_NONE, &Expr3);
/* Append deferred inc/dec at sequence point */ /* Append deferred inc/dec at sequence point */
DoDeferred (SQP_KEEP_EXPR, &Expr3); DoDeferred (SQP_KEEP_EXPR, &Expr3);
ED_FinalizeRValLoad (&Expr3); ED_FinalizeRValLoad (&Expr3);
} else { } else {
/* Constant boolean subexpression could still have deferred inc/ /* Constant boolean subexpression could still have deferred inc/
** dec operations, so just flush their side-effects at this ** dec operations, so just flush their side-effects at this
** sequence point. ** sequence point.
*/ */
DoDeferred (SQP_KEEP_NONE, &Expr3); DoDeferred (SQP_KEEP_NONE, &Expr3);
}
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);
} }