shithub: scc

Info  •  Files  •  Log  •  Branches

Do not create unneded node in initialization

We were dealing initializers in the same way that we dealt
assignations, and this was an error, because in the case
of ibnitializers we do not need any node to mark the kind
of operation.

--- a/cc1/init.c

+++ b/cc1/init.c

@@ -169,12 +169,12 @@

 	if (tp->op == FTN)

 		errorp("function '%s' is initialized like a variable", sym->name);

-	np = node(OINIT, tp, varnode(sym), initialize(tp));

+	np = initialize(tp);

 	if (flags & ISDEFINED) {

 		errorp("redeclaration of '%s'", sym->name);

 	} else if ((flags & (ISGLOBAL|ISLOCAL|ISPRIVATE)) != 0) {

-		if (!np->right->constant)

+		if (!np->constant)

 			errorp("initializer element is not constant");

 		emit(OINIT, np);

 		sym->flags |= ISDEFINED;

@@ -182,7 +182,7 @@

 		errorp("'%s' has both '%s' and initializer",

 		       sym->name, (flags&ISEXTERN) ? "extern" : "typedef");

 	} else {

-		np->op = OASSIGN;

+		np = node(OASSIGN, tp, varnode(sym), np);

 		emit(OEXPR, np);

 	}

 }