From 64ceacabf01fa275266b0dea8e0b3bd92f796703 Mon Sep 17 00:00:00 2001 From: Robert Konicar Date: Thu, 9 Nov 2023 16:54:11 +0100 Subject: [PATCH] conv:tc: Replace redefinitions from parent class with using. --- .../vast/Conversion/TypeConverters/HLToStd.hpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/include/vast/Conversion/TypeConverters/HLToStd.hpp b/include/vast/Conversion/TypeConverters/HLToStd.hpp index 9c1a67e424..f05b1e067e 100644 --- a/include/vast/Conversion/TypeConverters/HLToStd.hpp +++ b/include/vast/Conversion/TypeConverters/HLToStd.hpp @@ -110,6 +110,10 @@ namespace vast::conv::tc { , mixins< HLToStd > , HLAggregates< HLToStd > { + using Base = mixins< HLToStd >; + using Base::convert_type_to_type; + using Base::convert_type_to_types; + const mlir::DataLayout &dl; mlir::MLIRContext &mctx; @@ -185,20 +189,6 @@ namespace vast::conv::tc { }; } - maybe_types_t convert_type_to_types(mlir_type t, std::size_t count = 1) { - return Maybe(t) - .and_then(convert_type()) - .keep_if([&](const auto &ts) { return ts->size() == count; }) - .take_wrapped< maybe_types_t >(); - } - - maybe_type_t convert_type_to_type(mlir_type t) { - return Maybe(t) - .and_then([&](auto t) { return this->convert_type_to_types(t, 1); }) - .and_then([&](auto ts) { return *ts->begin(); }) - .take_wrapped< maybe_type_t >(); - } - maybe_type_t try_convert_intlike(mlir_type t) { // For now `bool` behaves the same way as any other integer type. if (!hl::isIntegerType(t) && !hl::isBoolType(t)) {