Clean up how procedures are typed in LLVM's dumb type system

1 files changed, 6 insertions, 41 deletions

diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp
index ee6980de4..65cc8c41d 100644
--- a/src/llvm_backend_general.cpp
+++ b/src/llvm_backend_general.cpp
@@ -861,39 +861,6 @@ void lb_const_store(lbValue ptr, lbValue value) {
 	LLVMSetInitializer(ptr.value, value.value);
 }
 
-
-bool lb_is_type_proc_recursive(Type *t) {
-	for (;;) {
-		if (t == nullptr) {
-			return false;
-		}
-		switch (t->kind) {
-		case Type_Named:
-			t = t->Named.base;
-			break;
-		case Type_Pointer:
-			t = t->Pointer.elem;
-			break;
-		case Type_Array:
-			t = t->Array.elem;
-			break;
-		case Type_EnumeratedArray:
-			t = t->EnumeratedArray.elem;
-			break;
-		case Type_Slice:
-			t = t->Slice.elem;
-			break;
-		case Type_DynamicArray:
-			t = t->DynamicArray.elem;
-			break;
-		case Type_Proc:
-			return true;
-		default:
-			return false;
-		}
-	}
-}
-
 void lb_emit_store(lbProcedure *p, lbValue ptr, lbValue value) {
 	GB_ASSERT(value.value != nullptr);
 	Type *a = type_deref(ptr.type);
@@ -953,7 +920,7 @@ void lb_emit_store(lbProcedure *p, lbValue ptr, lbValue value) {
 		}
 	}
 
-	if (lb_is_type_proc_recursive(a)) {
+	if (is_type_proc(a)) {
 		// NOTE(bill, 2020-11-11): Because of certain LLVM rules, a procedure value may be
 		// stored as regular pointer with no procedure information
 
@@ -1551,7 +1518,7 @@ LLVMTypeRef lb_type_internal_for_procedures_raw(lbModule *m, Type *type) {
 			if (e->flags & EntityFlag_ByPtr) {
 				param_type = lb_type(m, alloc_type_pointer(e_type));
 			} else if (is_type_boolean(e_type) &&
-			    type_size_of(e_type) <= 1) {
+			           type_size_of(e_type) <= 1) {
 				param_type = LLVMInt1TypeInContext(m->ctx);
 			} else {
 				if (is_type_proc(e_type)) {
@@ -2098,15 +2065,13 @@ LLVMTypeRef lb_type_internal(lbModule *m, Type *type) {
 		}
 
 	case Type_Proc:
-		// if (m->internal_type_level > 256) { // TODO HACK(bill): is this really enough?
-		if (m->internal_type_level > 1) { // TODO HACK(bill): is this really enough?
-			return LLVMPointerType(LLVMIntTypeInContext(m->ctx, 8), 0);
-		} else {
+		{
+			// NOTE(bill): we do an explicit cast to the correct procedure type when calling the procedure
 			LLVMTypeRef proc_raw_type = lb_type_internal_for_procedures_raw(m, type);
-			return LLVMPointerType(proc_raw_type, 0);
+			gb_unused(proc_raw_type);
+			return lb_type(m, t_rawptr);
 		}
 
-		break;
 	case Type_BitSet:
 		{
 			Type *ut = bit_set_to_int(type);