ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 23:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix polymorphic cast with pointers #303

Browse Source
This commit is contained in:
gingerBill
2018-12-14 14:53:31 +00:00
parent f36775ffd8
commit f2dae7023f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ir.cpp
+5 -3
View File
@@ -4597,7 +4597,7 @@ irValue *ir_emit_conv(irProcedure *proc, irValue *value, Type *t) {
st = base_type(st); st = base_type(st);
Type *dt = t; Type *dt = t;
bool dt_is_ptr = is_type_pointer(dt); bool dt_is_ptr = type_deref(dt) != dt;
GB_ASSERT(is_type_struct(st) || is_type_raw_union(st)); GB_ASSERT(is_type_struct(st) || is_type_raw_union(st));
String field_name = ir_lookup_subtype_polymorphic_field(proc->module->info, t, src_type); String field_name = ir_lookup_subtype_polymorphic_field(proc->module->info, t, src_type);
@@ -4608,13 +4608,15 @@ irValue *ir_emit_conv(irProcedure *proc, irValue *value, Type *t) {
ir_emit_comment(proc, str_lit("cast - polymorphism")); ir_emit_comment(proc, str_lit("cast - polymorphism"));
if (st_is_ptr) { if (st_is_ptr) {
irValue *res = ir_emit_deep_field_gep(proc, value, sel); irValue *res = ir_emit_deep_field_gep(proc, value, sel);
if (!dt_is_ptr) { Type *rt = ir_type(res);
if (!are_types_identical(rt, dt) && are_types_identical(type_deref(rt), dt)) {
res = ir_emit_load(proc, res); res = ir_emit_load(proc, res);
} }
return res; return res;
} else { } else {
if (is_type_pointer(ir_type(value))) { if (is_type_pointer(ir_type(value))) {
if (!dt_is_ptr) { Type *rt = ir_type(value);
if (!are_types_identical(rt, dt) && are_types_identical(type_deref(rt), dt)) {
value = ir_emit_load(proc, value); value = ir_emit_load(proc, value);
} else { } else {
value = ir_emit_deep_field_gep(proc, value, sel); value = ir_emit_deep_field_gep(proc, value, sel);