From 66b4252931a152a40c3713d0ec96348ae9762444 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Sun, 6 May 2018 15:31:18 +0100
Subject: Fix #210

---
 src/types.cpp | 96 -----------------------------------------------------------
 1 file changed, 96 deletions(-)

(limited to 'src/types.cpp')

diff --git a/src/types.cpp b/src/types.cpp
index e74aa88af..33ba05a2a 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -408,75 +408,6 @@ gb_global Type *t_map_header                  = nullptr;
 
 
 
-/*
-	NOTE(bill): This caching system is to reduce allocation clutter - inspired by Per Vogensen's Bitwise
- */
-enum CachedTypeKind {
-	CachedType_Invalid,
-
-	CachedType_Pointer,
-	CachedType_Array,
-	CachedType_Slice,
-	CachedType_DynamicArray,
-	CachedType_Map,
-
-	CachedType_COUNT
-};
-
-struct CachedType {
-	CachedTypeKind kind;
-	Type *type;
-};
-
-HashKey hash_cache_type_elem(Type *elem) {
-	return hash_ptr_and_id(elem, 0);
-}
-HashKey hash_cache_type_array(Type *elem, i64 count) {
-	return hash_ptr_and_id(elem, cast(u64)count);
-}
-HashKey hash_cache_type_map(Type *key, Type *value) {
-	HashKey hkey = {};
-	if ((key != nullptr) == (value != nullptr)) {
-		u64 v = cast(u64)cast(uintptr)value;
-		hkey = hash_ptr_and_id(key, v);
-	}
-	return hkey;
-}
-
-
-// Key: elem/elem+count/key+value
-gb_global Map<CachedType> cached_type_maps[CachedType_COUNT] = {};
-
-void init_cached_type_maps() {
-	for (isize i = 1; i < CachedType_COUNT; i++) {
-		map_init(&cached_type_maps[i], heap_allocator());
-	}
-}
-
-
-CachedType *find_cached_type(CachedTypeKind kind, HashKey key) {
-	GB_ASSERT(key.kind == HashKey_PtrAndId);
-	if (key.ptr_and_id.ptr == nullptr) {
-		// NOTE(bill): uncachable types
-		return nullptr;
-	}
-	auto *m = &cached_type_maps[kind];
-	return map_get(m, key);
-}
-
-void add_cached_type(CachedTypeKind kind, HashKey key, Type *type) {
-	GB_ASSERT(key.kind == HashKey_PtrAndId);
-	if (key.ptr_and_id.ptr == nullptr) {
-		// NOTE(bill): uncachable types
-		return;
-	}
-	CachedType ct = {};
-	ct.kind = kind;
-	ct.type = type;
-	map_set(&cached_type_maps[kind], key, ct);
-}
-
-
 i64      type_size_of               (Type *t);
 i64      type_align_of              (Type *t);
 i64      type_offset_of             (Type *t, i32 index);
@@ -560,15 +491,8 @@ Type *alloc_type_generic(Scope *scope, i64 id, String name, Type *specialized) {
 }
 
 Type *alloc_type_pointer(Type *elem) {
-	auto hkey = hash_cache_type_elem(elem);
-	if (auto found = find_cached_type(CachedType_Pointer, hkey)) {
-		return found->type;
-	}
-
 	Type *t = alloc_type(Type_Pointer);
 	t->Pointer.elem = elem;
-
-	add_cached_type(CachedType_Pointer, hkey, t);
 	return t;
 }
 
@@ -580,36 +504,21 @@ Type *alloc_type_array(Type *elem, i64 count, Type *generic_count = nullptr) {
 		t->Array.generic_count = generic_count;
 		return t;
 	}
-	auto hkey = hash_cache_type_array(elem, count);
-	if (auto found = find_cached_type(CachedType_Array, hkey)) {
-		return found->type;
-	}
 	Type *t = alloc_type(Type_Array);
 	t->Array.elem = elem;
 	t->Array.count = count;
-	add_cached_type(CachedType_Array, hkey, t);
 	return t;
 }
 
 Type *alloc_type_slice(Type *elem) {
-	auto hkey = hash_cache_type_elem(elem);
-	if (auto found = find_cached_type(CachedType_Slice, hkey)) {
-		return found->type;
-	}
 	Type *t = alloc_type(Type_Slice);
 	t->Array.elem = elem;
-	add_cached_type(CachedType_Slice, hkey, t);
 	return t;
 }
 
 Type *alloc_type_dynamic_array(Type *elem) {
-	auto hkey = hash_cache_type_elem(elem);
-	if (auto found = find_cached_type(CachedType_DynamicArray, hkey)) {
-		return found->type;
-	}
 	Type *t = alloc_type(Type_DynamicArray);
 	t->DynamicArray.elem = elem;
-	add_cached_type(CachedType_DynamicArray, hkey, t);
 	return t;
 }
 
@@ -678,14 +587,9 @@ Type *alloc_type_map(i64 count, Type *key, Type *value) {
 		GB_ASSERT(is_type_valid_for_keys(key));
 		GB_ASSERT(value != nullptr);
 	}
-	auto hkey = hash_cache_type_map(key, value);
-	if (auto found = find_cached_type(CachedType_Map, hkey)) {
-		return found->type;
-	}
 	Type *t = alloc_type(Type_Map);
 	t->Map.key   = key;
 	t->Map.value = value;
-	add_cached_type(CachedType_Map, hkey, t);
 	return t;
 }
 
-- 
cgit v1.2.3