diff options
| author | Ginger Bill <bill@gingerbill.org> | 2017-05-09 12:05:17 +0100 |
|---|---|---|
| committer | Ginger Bill <bill@gingerbill.org> | 2017-05-09 12:05:17 +0100 |
| commit | 8677c81da7ca8af37c49a203a18fd7beab74f023 (patch) | |
| tree | 621f6728ac747560209c5a8078f831169499295f /src | |
| parent | 5595daf5a39306179bb924f0c778bbba284391ec (diff) | |
Fix ir bug; allow formatting options for arrays & et al.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ir.c | 4 | ||||
| -rw-r--r-- | src/types.c | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -2710,8 +2710,8 @@ irValue *ir_emit_conv(irProcedure *proc, irValue *value, Type *t) { if (is_type_integer(src) && is_type_integer(dst)) { GB_ASSERT(src->kind == Type_Basic && dst->kind == Type_Basic); - i64 sz = type_size_of(proc->module->allocator, src); - i64 dz = type_size_of(proc->module->allocator, dst); + i64 sz = type_size_of(proc->module->allocator, default_type(src)); + i64 dz = type_size_of(proc->module->allocator, default_type(dst)); irConvKind kind = irConv_trunc; if (dz < sz) { diff --git a/src/types.c b/src/types.c index e363c6b2c..c67dc11ef 100644 --- a/src/types.c +++ b/src/types.c @@ -1763,7 +1763,7 @@ i64 type_size_of_internal(gbAllocator allocator, Type *t, TypePath *path) { } break; case Type_Basic: { - GB_ASSERT(is_type_typed(t)); + GB_ASSERT_MSG(is_type_typed(t), "%s", type_to_string(t)); BasicKind kind = t->Basic.kind; i64 size = t->Basic.size; if (size > 0) { |