X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=8ec417136d938abeb09c4cd22c68a8b43fa9d71b;hb=cb28c2a2955a21f27cbec01fa86a6eebf514ee76;hp=ed071224a37b0b62c18ff43db6695944acc2067c;hpb=220bd1d88703eede6a4891f3014708c8259b303e;p=cparser

diff --git a/type_hash.c b/type_hash.c
index ed07122..8ec4171 100644
--- a/type_hash.c
+++ b/type_hash.c
@@ -1,3 +1,22 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <config.h>
 
 #include <stdbool.h>
@@ -79,7 +98,7 @@ static unsigned hash_typeof_type(const typeof_type_t *type)
 
 static unsigned hash_bitfield_type(const bitfield_type_t *type)
 {
-	unsigned result  = hash_ptr(type->base);
+	unsigned result  = hash_ptr(type->base_type);
 	result          ^= 27172145;
 
 	return result;
@@ -93,6 +112,8 @@ static unsigned hash_type(const type_t *type)
 	case TYPE_INVALID:
 		panic("internalizing void or invalid types not possible");
 		return 0;
+	case TYPE_ERROR:
+		return 0;
 	case TYPE_ATOMIC:
 		hash = hash_atomic_type(&type->atomic);
 		break;
@@ -179,6 +200,13 @@ static bool array_types_equal(const array_type_t *type1,
 		return false;
 	if(type1->is_static != type2->is_static)
 		return false;
+	if(type1->size_constant != type2->size_constant)
+		return false;
+
+	/* never identify vla types, because we need them for caching calculated
+	 * sizes later in ast2firm */
+	if(type1->is_vla || type2->is_vla)
+		return false;
 
 	/* TODO: compare size expressions for equality... */
 
@@ -223,7 +251,7 @@ static bool typeof_types_equal(const typeof_type_t *type1,
 static bool bitfield_types_equal(const bitfield_type_t *type1,
                                  const bitfield_type_t *type2)
 {
-	if(type1->base != type2->base)
+	if(type1->base_type != type2->base_type)
 		return false;
 	/* TODO: compare size expression */
 	return false;
@@ -239,6 +267,9 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 		return false;
 
 	switch(type1->kind) {
+	case TYPE_ERROR:
+		/* Hmm, the error type is never equal */
+		return false;
 	case TYPE_INVALID:
 		return false;
 	case TYPE_ATOMIC: