From 57d4333ed3a36778a034f144a6998587d61ed831 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 14 Dec 2018 15:45:14 +0000 Subject: Fix polymorphic procedure generation with debug information --- src/check_expr.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/check_expr.cpp') diff --git a/src/check_expr.cpp b/src/check_expr.cpp index cb7be9b74..6e4bf05e6 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -265,7 +265,6 @@ bool find_or_generate_polymorphic_procedure(CheckerContext *c, Entity *base_enti } - bool generate_type_again = nctx.no_polymorphic_errors; auto *pt = &src->Proc; @@ -293,8 +292,12 @@ bool find_or_generate_polymorphic_procedure(CheckerContext *c, Entity *base_enti } } - +#if 0 + bool generate_type_again = nctx.no_polymorphic_errors; if (generate_type_again) { +#else + { +#endif // LEAK TODO(bill): This is technically a memory leak as it has to generate the type twice bool prev_no_polymorphic_errors = nctx.no_polymorphic_errors; defer (nctx.no_polymorphic_errors = prev_no_polymorphic_errors); @@ -5004,7 +5007,11 @@ CallArgumentError check_polymorphic_record_type(CheckerContext *c, Operand *oper } } else { i64 s = 0; - if (!check_is_assignable_to_with_score(c, o, e->type, &s)) { + if (is_type_generic(o->type)) { + // Polymorphic name! + score += assign_score_function(0); + continue; + } else if (!check_is_assignable_to_with_score(c, o, e->type, &s)) { if (show_error) { check_assignment(c, o, e->type, str_lit("polymorphic type argument")); } -- cgit v1.2.3