From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Sat, 13 Sep 2008 11:20:23 +0000 (+0000)
Subject: Preserve type qualifiers in parse_select_expression().
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=a3bf8f75e5dd09657265b5701aa15a552439a2ed;p=cparser

Preserve type qualifiers in parse_select_expression().

[r21926]
---

diff --git a/parser.c b/parser.c
index b8e8fd7..86d4764 100644
--- a/parser.c
+++ b/parser.c
@@ -6792,11 +6792,23 @@ create_error_entry:
 	}
 
 	select->select.compound_entry = entry;
+
+	type_t            *res_type = entry->type;
+	type_qualifiers_t  qual     = type_left->base.qualifiers;
+	if (qual != 0) {
+		type_t *const copy = duplicate_type(res_type);
+		copy->base.qualifiers |= qual;
+
+		res_type = typehash_insert(copy);
+		if (type != copy)
+			free_type(copy);
+	}
+
 	/* we always do the auto-type conversions; the & and sizeof parser contains
 	 * code to revert this! */
-	select->base.type = automatic_type_conversion(entry->type);
+	select->base.type = automatic_type_conversion(res_type);
 
-	type_t *skipped = skip_typeref(entry->type);
+	type_t *skipped = skip_typeref(res_type);
 	if (skipped->kind == TYPE_BITFIELD) {
 		select->base.type = skipped->bitfield.base_type;
 	}