From 5e706bab56eb28023d27623e0d33c4b5e06b5781 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 4 Apr 2020 21:23:11 +0100 Subject: Fix typeid comparison bug in `ir.cpp` --- src/checker.cpp | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'src/checker.cpp') diff --git a/src/checker.cpp b/src/checker.cpp index c8b737df8..a6cb80b7d 100644 --- a/src/checker.cpp +++ b/src/checker.cpp @@ -1035,12 +1035,22 @@ void add_type_and_value(CheckerInfo *i, Ast *expr, AddressingMode mode, Type *ty return; } - expr->tav.mode = mode; - expr->tav.type = type; - if (mode == Addressing_Constant || mode == Addressing_Invalid) { - expr->tav.value = value; - } else if (mode == Addressing_Value && is_type_typeid(type)) { - expr->tav.value = value; + Ast *prev_expr = nullptr; + for (;;) { + if (prev_expr != expr) { + expr->tav.mode = mode; + expr->tav.type = type; + if (mode == Addressing_Constant || mode == Addressing_Invalid) { + expr->tav.value = value; + } else if (mode == Addressing_Value && is_type_typeid(type)) { + expr->tav.value = value; + } + + prev_expr = expr; + } else { + break; + } + expr = unparen_expr(expr); } } -- cgit v1.2.3