From e71a6413799577b2e422026003cfcd0fac72c7c7 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 10 Apr 2018 20:46:32 +0100 Subject: [PATCH] Fix internal compiler error trigger for issue #212 --- src/check_expr.cpp | 4 ++++ src/types.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/check_expr.cpp b/src/check_expr.cpp index d2da4d02e..c2ca5471a 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -5544,6 +5544,10 @@ ExprKind check_expr_base_internal(Checker *c, Operand *o, AstNode *node, Type *t is_constant = false; } + if (bet == t_invalid) { + break; + } + for (; index < cl->elems.count; index++) { AstNode *e = cl->elems[index]; if (e == nullptr) { diff --git a/src/types.cpp b/src/types.cpp index d3029cd6c..e74aa88af 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -1201,6 +1201,10 @@ bool type_has_nil(Type *t) { } bool elem_type_can_be_constant(Type *t) { + t = base_type(t); + if (t == t_invalid) { + return false; + } if (is_type_any(t) || is_type_union(t)) { return false; }