.alignment = 0,
.flags = ATOMIC_TYPE_FLAG_NONE
},
+ [ATOMIC_TYPE_WCHAR_T] = {
+ .size = (unsigned)-1,
+ .alignment = (unsigned)-1,
+ /* signed flag will be set when known */
+ .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC,
+ },
[ATOMIC_TYPE_CHAR] = {
.size = 1,
.alignment = 1,
/* TODO: make this configurable for platforms which do not use byte sized
* bools. */
props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UCHAR];
+
+ props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind];
}
void exit_types(void)
switch(kind) {
case ATOMIC_TYPE_INVALID: break;
case ATOMIC_TYPE_VOID: return "void";
+ case ATOMIC_TYPE_WCHAR_T: return "wchar_t";
case ATOMIC_TYPE_BOOL: return c_mode & _CXX ? "bool" : "_Bool";
case ATOMIC_TYPE_CHAR: return "char";
case ATOMIC_TYPE_SCHAR: return "signed char";
}
} else {
entity_t *parameter = parameters->entities;
- for( ; parameter != NULL; parameter = parameter->base.next) {
+ for (; parameter != NULL; parameter = parameter->base.next) {
if (first) {
first = false;
} else {
fputs(", ", out);
}
assert(is_declaration(parameter));
- print_type_ext(parameter->declaration.type, parameter->base.symbol,
- NULL);
+ const type_t *const type = parameter->declaration.type;
+ if (type == NULL) {
+ fputs(parameter->base.symbol->string, out);
+ } else {
+ print_type_ext(type, parameter->base.symbol, NULL);
+ }
}
}
if (type->variadic) {
fputs(") ", out);
}
fputc('*', out);
- print_type_qualifiers(type->base.qualifiers);
- if (type->base.qualifiers != 0)
+ type_qualifiers_t const qual = type->base.qualifiers;
+ if (qual != 0)
fputc(' ', out);
+ print_type_qualifiers(qual);
}
/**
{
fputs("typeof(", out);
if (type->expression != NULL) {
- assert(type->typeof_type == NULL);
print_expression(type->expression);
} else {
print_type(type->typeof_type);
type_t *copy = obstack_alloc(type_obst, size);
memcpy(copy, type, size);
+ copy->base.firm_type = NULL;
return copy;
}
type_t *unqualified_type = duplicate_type(type);
unqualified_type->base.qualifiers = TYPE_QUALIFIER_NONE;
- type_t *result = typehash_insert(unqualified_type);
- if (result != unqualified_type) {
- obstack_free(type_obst, unqualified_type);
- }
-
- return result;
+ return identify_new_type(unqualified_type);
}
type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual)
return type;
}
- type = typehash_insert(copy);
- if (type != copy)
- obstack_free(type_obst, copy);
-
- return type;
+ return identify_new_type(copy);
}
/**
{
type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
type_modifiers_t modifiers = TYPE_MODIFIER_NONE;
+ il_alignment_t alignment = 0;
while (true) {
+ if (alignment < type->base.alignment)
+ alignment = type->base.alignment;
+
switch (type->kind) {
case TYPE_ERROR:
return type;
case TYPE_TYPEDEF: {
qualifiers |= type->base.qualifiers;
modifiers |= type->base.modifiers;
+
const typedef_type_t *typedef_type = &type->typedeft;
if (typedef_type->resolved_type != NULL) {
type = typedef_type->resolved_type;
continue;
}
case TYPE_TYPEOF: {
+ qualifiers |= type->base.qualifiers;
+ modifiers |= type->base.modifiers;
+
const typeof_type_t *typeof_type = &type->typeoft;
if (typeof_type->typeof_type != NULL) {
type = typeof_type->typeof_type;
break;
}
- if (qualifiers != TYPE_QUALIFIER_NONE || modifiers != TYPE_MODIFIER_NONE) {
+ if (qualifiers != TYPE_QUALIFIER_NONE ||
+ modifiers != TYPE_MODIFIER_NONE ||
+ alignment > type->base.alignment) {
type_t *const copy = duplicate_type(type);
/* for const with typedefed array type the element type has to be
element_type = duplicate_type(element_type);
element_type->base.qualifiers |= qualifiers;
element_type->base.modifiers |= modifiers;
+ element_type->base.alignment = alignment;
copy->array.element_type = element_type;
} else {
copy->base.qualifiers |= qualifiers;
copy->base.modifiers |= modifiers;
+ copy->base.alignment = alignment;
}
- type = typehash_insert(copy);
- if (type != copy) {
- obstack_free(type_obst, copy);
- }
+ type = identify_new_type(copy);
}
return type;
* Hash the given type and return the "singleton" version
* of it.
*/
-static type_t *identify_new_type(type_t *type)
+type_t *identify_new_type(type_t *type)
{
type_t *result = typehash_insert(type);
if (result != type) {