From 560bdc339b1137ab6f52878a13dce0a4742b6153 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 31 Oct 2019 22:39:12 +0000 Subject: Fix stack overflow bug caused by polymorphic record with polymorphic constant parameters. #447 DOES NOT FIX THE UNDERLYING BUG --- src/check_type.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/check_type.cpp') diff --git a/src/check_type.cpp b/src/check_type.cpp index ef68203ab..cf5855a3e 100644 --- a/src/check_type.cpp +++ b/src/check_type.cpp @@ -262,25 +262,29 @@ Entity *find_polymorphic_record_entity(CheckerContext *ctx, Type *original_type, for (isize j = 0; j < param_count; j++) { Entity *p = tuple->variables[j]; Operand o = ordered_operands[j]; + Entity *oe = entity_of_node(o.expr); + if (p == oe) { + // NOTE(bill): This is the same type, make sure that it will be be same thing and use that + // Saves on a lot of checking too below + continue; + } + if (p->kind == Entity_TypeName) { if (is_type_polymorphic(o.type)) { // NOTE(bill): Do not add polymorphic version to the gen_types skip = true; break; - } else if (!are_types_identical(o.type, p->type)) { - skip = true; - break; } - } else if (p->kind == Entity_Constant) { - if (o.mode != Addressing_Constant) { - if (failure) *failure = true; + if (!are_types_identical(o.type, p->type)) { skip = true; break; } + } else if (p->kind == Entity_Constant) { if (!compare_exact_values(Token_CmpEq, o.value, p->Constant.value)) { skip = true; break; - } else if (!are_types_identical(o.type, p->type)) { + } + if (!are_types_identical(o.type, p->type)) { skip = true; break; } -- cgit v1.2.3