print_type_qualifiers(type->type.qualifiers);
const char *s;
- switch(type->atype) {
+ switch(type->akind) {
case ATOMIC_TYPE_INVALID: s = "INVALIDATOMIC"; break;
case ATOMIC_TYPE_VOID: s = "void"; break;
case ATOMIC_TYPE_BOOL: s = "_Bool"; break;
if(type->kind != TYPE_ATOMIC)
return false;
- switch(type->atomic.atype) {
+ switch(type->atomic.akind) {
case ATOMIC_TYPE_BOOL:
case ATOMIC_TYPE_CHAR:
case ATOMIC_TYPE_SCHAR:
if(type->kind != TYPE_ATOMIC)
return false;
- switch(type->atomic.atype) {
+ switch(type->atomic.akind) {
case ATOMIC_TYPE_FLOAT:
case ATOMIC_TYPE_DOUBLE:
case ATOMIC_TYPE_LONG_DOUBLE:
if(type->kind != TYPE_ATOMIC)
return false;
- switch(type->atomic.atype) {
+ switch(type->atomic.akind) {
case ATOMIC_TYPE_CHAR:
case ATOMIC_TYPE_SCHAR:
case ATOMIC_TYPE_SHORT:
return type->array.size == NULL;
case TYPE_ATOMIC:
- return type->atomic.atype == ATOMIC_TYPE_VOID;
+ return type->atomic.akind == ATOMIC_TYPE_VOID;
case TYPE_POINTER:
case TYPE_ENUM:
case TYPE_FUNCTION:
return function_types_compatible(&type1->function, &type2->function);
case TYPE_ATOMIC:
- return type1->atomic.atype == type2->atomic.atype;
+ return type1->atomic.akind == type2->atomic.akind;
case TYPE_ARRAY:
return array_types_compatible(&type1->array, &type2->array);
type_t *skip_typeref(type_t *type)
{
- unsigned qualifiers = type->base.qualifiers;
+ unsigned qualifiers = TYPE_QUALIFIER_NONE;
while(true) {
switch(type->kind) {
break;
}
+ if (qualifiers != TYPE_QUALIFIER_NONE) {
+ type_t *const copy = duplicate_type(type);
+ copy->base.qualifiers |= qualifiers;
+
+ type = typehash_insert(copy);
+ if (type != copy) {
+ obstack_free(type_obst, copy);
+ }
+ }
+
return type;
}
return result;
}
-type_t *make_atomic_type(atomic_type_type_t atype, type_qualifiers_t qualifiers)
+type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers)
{
type_t *type = obstack_alloc(type_obst, sizeof(atomic_type_t));
memset(type, 0, sizeof(atomic_type_t));
type->kind = TYPE_ATOMIC;
type->base.qualifiers = qualifiers;
- type->atomic.atype = atype;
+ type->atomic.akind = atype;
return identify_new_type(type);
}