scc

commit eadc7784288c38da564aa1f11602d0c195f5dabb
parent b9158535e95666900dd3f78ebb53eb7a0dba964f
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Tue,  1 Sep 2015 19:28:07 +0200

Make fold a bit more robust

These default cases make that in unknown operations the
behaviour is correct, because in other case the operation
is directly ignored.

Diffstat:
M
cc1/fold.c
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/cc1/fold.c b/cc1/fold.c
@@ -86,6 +86,7 @@ static bool
 foldint(int op, Symbol *res, TINT l, TINT r)
 {
 	TINT i;
+	Type *tp = res->type;
 	bool (*validate)(TINT, TINT, Type *tp);
 
 	switch (op) {
@@ -99,7 +100,7 @@ foldint(int op, Symbol *res, TINT l, TINT r)
 	default:   validate = NULL; break;
 	}
 
-	if (validate && !(*validate)(l, r, res->type))
+	if (validate && !(*validate)(l, r, tp))
 		return 0;
 
 	switch (op) {
@@ -123,6 +124,7 @@ foldint(int op, Symbol *res, TINT l, TINT r)
 	case ONE:   i = l != r; break;
 	case ONEG:  i = -l;     break;
 	case OCPL:  i = ~l;     break;
+	default:    return 0;
 	}
 	res->u.i = i;
 	return 1;
@@ -155,6 +157,7 @@ folduint(int op, Symbol *res, TINT l, TINT r)
 	case OLE:   i = l <= r; goto unsign;
 	case OEQ:   i = l == r; goto unsign;
 	case ONE:   i = l != r; goto unsign;
+	default:    return 0;
 	}
 
 sign:
@@ -201,7 +204,7 @@ foldconst(int type, int op, Type *tp, Symbol *ls, Symbol *rs)
 	TUINT u;
 	TFLOAT f;
 
-	aux.type = ls->type;
+	aux.type = tp;
 	switch (type) {
 	case INT:
 		i = (rs) ? rs->u.i : 0;