shithub: scc

Info  •  Files  •  Log  •  Branches

[cc1] Remove einit in For()

Decl() is emiting the initializer and it means that in some cases
the expression is emitted in the switch and in other cases
after the switch. It is profitable to have the invariant that
the expression is emitted in the switch for all the cases.

--- a/cc1/stmt.c

+++ b/cc1/stmt.c

@@ -96,7 +96,7 @@

 For(Symbol *lbreak, Symbol *lcont, Switch *lswitch)

 {

 	Symbol *begin, *cond;

-	Node *econd, *einc, *einit = NULL;

+	Node *econd, *einc;

 	begin = newlabel();

 	lcont = newlabel();

@@ -115,7 +115,7 @@

 		decl();

 		break;

 	default:

-		einit = expr();

+		emit(OEXPR, expr());

 	case ';':

 		expect(';');

 		break;

@@ -125,7 +125,6 @@

 	einc = (yytoken != ')') ? expr() : NULL;

 	expect(')');

-	emit(OEXPR, einit);

 	emit(OJUMP, cond);

 	emit(OBLOOP, NULL);