Browse Source

Fix pointer cast of constant procedure values

gingerBill 2 years ago
parent
commit
3fae8b49db
1 changed files with 9 additions and 10 deletions
  1. 9 10
      src/llvm_backend_const.cpp

+ 9 - 10
src/llvm_backend_const.cpp

@@ -381,12 +381,17 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bool allow_loc
 	}
 	}
 
 
 	if (value.kind == ExactValue_Procedure) {
 	if (value.kind == ExactValue_Procedure) {
+		lbValue res = {};
 		Ast *expr = unparen_expr(value.value_procedure);
 		Ast *expr = unparen_expr(value.value_procedure);
 		if (expr->kind == Ast_ProcLit) {
 		if (expr->kind == Ast_ProcLit) {
-			return lb_generate_anonymous_proc_lit(m, str_lit("_proclit"), expr);
+			res = lb_generate_anonymous_proc_lit(m, str_lit("_proclit"), expr);
+
+		} else {
+			Entity *e = entity_from_expr(expr);
+			res = lb_find_procedure_value_from_entity(m, e);
 		}
 		}
-		Entity *e = entity_from_expr(expr);
-		return lb_find_procedure_value_from_entity(m, e);
+		res.value = LLVMConstPointerCast(res.value, lb_type(m, res.type));
+		return res;
 	}
 	}
 
 
 	bool is_local = allow_local && m->curr_procedure != nullptr;
 	bool is_local = allow_local && m->curr_procedure != nullptr;
@@ -1141,13 +1146,7 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bool allow_loc
 		}
 		}
 		break;
 		break;
 	case ExactValue_Procedure:
 	case ExactValue_Procedure:
-		{
-			Ast *expr = value.value_procedure;
-			GB_ASSERT(expr != nullptr);
-			if (expr->kind == Ast_ProcLit) {
-				return lb_generate_anonymous_proc_lit(m, str_lit("_proclit"), expr);
-			}
-		}
+		GB_PANIC("handled earlier");
 		break;
 		break;
 	case ExactValue_Typeid:
 	case ExactValue_Typeid:
 		return lb_typeid(m, value.value_typeid);
 		return lb_typeid(m, value.value_typeid);