Add missing lvalue conversions

typeintpromote and typeargpromote assume they are dealing with an
unqualified type, and return an incorrect result if they are given a
qualified one. So, add an assert here.

This was causing const integer types to get promoted to themselves due
to missing lvalue conversions.

Thanks to Andrew Chambers for the bug report and test case.

1 files changed, 2 insertions, 0 deletions

diff --git a/type.c b/type.c
index 97def21..d5550d3 100644
--- a/type.c
+++ b/type.c
@@ -237,6 +237,7 @@ typeunqual(struct type *t, enum typequalifier *tq)
 struct type *
 typeintpromote(struct type *t)
 {
+	assert(t->kind != TYPEQUALIFIED);
 	if (typeprop(t) & PROPINT && typerank(t) <= typerank(&typeint))
 		return t->size < typeint.size || t->basic.issigned ? &typeint : &typeuint;
 	return t;
@@ -245,6 +246,7 @@ typeintpromote(struct type *t)
 struct type *
 typeargpromote(struct type *t)
 {
+	assert(t->kind != TYPEQUALIFIED);
 	if (t == &typefloat)
 		return &typedouble;
 	return typeintpromote(t);