Browse Source

fix some LLVM assertions

Laytan Laats 11 months ago
parent
commit
3b22c0854c
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/llvm_backend_const.cpp
  2. 1 1
      src/llvm_backend_type.cpp

+ 2 - 2
src/llvm_backend_const.cpp

@@ -154,7 +154,7 @@ gb_internal LLVMValueRef llvm_const_named_struct(lbModule *m, Type *t, LLVMValue
 	GB_ASSERT(value_count_ == bt->Struct.fields.count);
 	
 	auto field_remapping = lb_get_struct_remapping(m, t);
-	unsigned values_with_padding_count = LLVMCountStructElementTypes(struct_type);
+	unsigned values_with_padding_count = elem_count;
 	
 	LLVMValueRef *values_with_padding = gb_alloc_array(permanent_allocator(), LLVMValueRef, values_with_padding_count);
 	for (unsigned i = 0; i < value_count; i++) {
@@ -722,7 +722,7 @@ gb_internal lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bo
 		}
 
 	case ExactValue_Integer:
-		if (is_type_pointer(type) || is_type_multi_pointer(type)) {
+		if (is_type_pointer(type) || is_type_multi_pointer(type) || is_type_proc(type)) {
 			LLVMTypeRef t = lb_type(m, original_type);
 			LLVMValueRef i = lb_big_int_to_llvm(m, t_uintptr, &value.value_integer);
 			res.value = LLVMConstIntToPtr(i, t);

+ 1 - 1
src/llvm_backend_type.cpp

@@ -826,7 +826,7 @@ gb_internal void lb_setup_type_info_data_giant_array(lbModule *m, i64 global_typ
 
 
 				if (t->Struct.soa_kind != StructSoa_None) {
-					Type *kind_type = get_struct_field_type(tag_type, 10);
+					Type *kind_type = get_struct_field_type(tag_type, 7);
 
 					lbValue soa_kind = lb_const_value(m, kind_type, exact_value_i64(t->Struct.soa_kind));
 					LLVMValueRef soa_type = get_type_info_ptr(m, t->Struct.soa_elem);