From d4681529c20d5cb2630bfe09f4cf4c4ca4c98a23 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Wed, 18 Nov 2026 00:10:23 +0100 Subject: Restrict pointer subtraction by type --- boot/type_check.cc | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'boot/type_check.cc') diff --git a/boot/type_check.cc b/boot/type_check.cc index bebee9a..4e21791 100644 --- a/boot/type_check.cc +++ b/boot/type_check.cc @@ -423,13 +423,11 @@ namespace elna::boot { return rhs; } - const bool lhs_integral = is_integral_type(lhs); - - if (lhs_integral == is_integral_type(rhs)) + if (const std::shared_ptr pointer = lhs.get()) { - return std::nullopt; + return find_opaque_type(pointer->base); } - if (const auto pointer = (lhs_integral ? rhs : lhs).get()) + if (const std::shared_ptr pointer = rhs.get()) { return find_opaque_type(pointer->base); } @@ -1544,9 +1542,22 @@ namespace elna::boot || (is_numeric_type(lhs_resolved) && lhs_resolved == rhs_resolved); break; case subtraction: - valid = (is_any_pointer_type(lhs_resolved) && is_integral_type(rhs_resolved)) - || (is_any_pointer_type(lhs_resolved) && is_any_pointer_type(rhs_resolved)) - || (is_numeric_type(lhs_resolved) && lhs_resolved == rhs_resolved); + if (const std::shared_ptr lhs_pointer = lhs_resolved.get()) + { + if (const std::shared_ptr rhs_pointer = rhs_resolved.get()) + { + valid = resolve_underlying_type(lhs_pointer->base) + == resolve_underlying_type(rhs_pointer->base); + } + else + { + valid = is_integral_type(rhs_resolved); + } + } + else + { + valid = is_numeric_type(lhs_resolved) && lhs_resolved == rhs_resolved; + } break; case division: case multiplication: -- cgit v1.2.3