Do not crash on alignof($TYPE).

[cparser] / type_hash.c

diff --git a/type_hash.c b/type_hash.c
index aa5aa21..7f2e30a 100644 (file)
--- a/type_hash.c
+++ b/type_hash.c
@@ -74,7 +74,7 @@ static unsigned hash_imaginary_type(const imaginary_type_t *type)
 
 static unsigned hash_pointer_type(const pointer_type_t *type)
 {
-       return hash_ptr(type->points_to);
+       return hash_ptr(type->points_to) ^ hash_ptr(type->base_variable);
 }
 
 static unsigned hash_reference_type(const reference_type_t *type)
@@ -92,8 +92,6 @@ static unsigned hash_compound_type(const compound_type_t *type)
        return hash_ptr(type->compound);
 }
 
-static unsigned hash_type(const type_t *type);
-
 static unsigned hash_function_type(const function_type_t *type)
 {
        unsigned result = hash_ptr(type->return_type);
@@ -137,7 +135,6 @@ static unsigned hash_type(const type_t *type)
        switch (type->kind) {
        case TYPE_INVALID:
                panic("internalizing void or invalid types not possible");
-               return 0;
        case TYPE_ERROR:
                return 0;
        case TYPE_ATOMIC:
@@ -184,6 +181,7 @@ static unsigned hash_type(const type_t *type)
 
        unsigned some_prime = 99991;
        hash ^= some_prime * type->base.qualifiers;
+       hash ^= some_prime * type->base.alignment;
 
        return hash;
 }
@@ -325,6 +323,8 @@ static bool types_equal(const type_t *type1, const type_t *type2)
                return false;
        if (type1->base.modifiers != type2->base.modifiers)
                return false;
+       if (type1->base.alignment != type2->base.alignment)
+               return false;
 
        switch (type1->kind) {
        case TYPE_ERROR: