/*
 * MRustC - Rust Compiler
 * - By John Hodge (Mutabah/thePowersGang)
 *
 * hir_expand/closures.cpp
 * - HIR Expansion - Closures
 */
#include <hir/visitor.hpp>
#include <hir/expr.hpp>
#include <hir_typeck/static.hpp>
#include <algorithm>
#include <hir/expr_state.hpp>
#include "main_bindings.hpp"

namespace {
    inline HIR::ExprNodeP mk_exprnodep(HIR::ExprNode* en, ::HIR::TypeRef ty){ en->m_res_type = mv$(ty); return HIR::ExprNodeP(en); }

    const RcString rcstring_Self = RcString::new_interned("Self");
    const RcString rcstring_self = RcString::new_interned("self");
    const RcString rcstring_arg  = RcString::new_interned("arg");
    const RcString rcstring_args = RcString::new_interned("args");
    const RcString rcstring_call_free = RcString::new_interned("call_free");
    const RcString rcstring_call_once = RcString::new_interned("call_once");
    const RcString rcstring_call_mut  = RcString::new_interned("call_mut");
    const RcString rcstring_call      = RcString::new_interned("call");
}
#define NEWNODE(TY, CLASS, ...)  mk_exprnodep(new HIR::ExprNode_##CLASS(__VA_ARGS__), TY)

namespace {

    typedef ::std::function< ::std::pair<::HIR::SimplePath, const ::HIR::TypeItem*>(const char* prefix, const char* suffix, ::HIR::TypeItem )>   new_type_cb_t;
    typedef ::std::vector< ::std::pair< ::HIR::ExprNode_Closure::Class, ::HIR::TraitImpl> > out_impls_closure_t;
    /// <Trait LangItem> and <TraitImpl>
    typedef ::std::vector< ::std::pair<const char*, ::HIR::TraitImpl> > out_trait_impls_t;
    struct OutState
    {
        out_impls_closure_t     impls_closure;
        out_trait_impls_t   trait_impls;
        std::vector< std::unique_ptr<HIR::TypeImpl> >  impls_type;

        new_type_cb_t   new_type;

        void push_new_impls(const Span& sp, ::HIR::Crate& crate);
        struct Counts {
            size_t  closure;
            size_t  traits;
            size_t  type;
        };
        Counts save_counts() const {
            return Counts { impls_closure.size(), trait_impls.size(), impls_type.size() };
        }
        void update_source_module(Counts c, const HIR::SimplePath& path) {
            for(auto i = c.closure; i < impls_closure.size(); i ++) {
                if( impls_closure[i].second.m_src_module == HIR::SimplePath() ) {
                    impls_closure[i].second.m_src_module = path;
                }
            }
            for(auto i = c.traits; i < trait_impls.size(); i ++) {
                if( trait_impls[i].second.m_src_module == HIR::SimplePath() ) {
                    trait_impls[i].second.m_src_module = path;
                }
            }
            for(auto i = c.type; i < impls_type.size(); i ++) {
                if( impls_type[i]->m_src_module == HIR::SimplePath() ) {
                    impls_type[i]->m_src_module = path;
                }
            }
        }
    };

    template<typename K, typename V>
    ::std::map<K,V> make_map1(K k1, V v1) {
        ::std::map<K,V> rv;
        rv.insert( ::std::make_pair(mv$(k1), mv$(v1)) );
        return rv;
    }
    template<typename T>
    ::std::vector<T> make_vec2(T v1, T v2) {
        ::std::vector<T>    rv;
        rv.reserve(2);
        rv.push_back( mv$(v1) );
        rv.push_back( mv$(v2) );
        return rv;
    }
    template<typename T>
    ::std::vector<T> make_vec3(T v1, T v2, T v3) {
        ::std::vector<T>    rv;
        rv.reserve(3);
        rv.push_back( mv$(v1) );
        rv.push_back( mv$(v2) );
        rv.push_back( mv$(v3) );
        return rv;
    }

    void OutState::push_new_impls(const Span& sp, ::HIR::Crate& crate)
    {
        auto check_state = [&crate](::HIR::TraitImpl& ti) {
            for(auto& m : ti.m_methods) {
                ASSERT_BUG(Span(), m.second.data.m_code.m_state, "Missing expression state on " << ti.m_type << " :: " << m.first);
            }
            };
        auto push_trait_impl = [&](const ::HIR::SimplePath& p, std::unique_ptr<::HIR::TraitImpl> ptr) {
            check_state(*ptr);
            auto& trait_impl_list_r = crate.m_all_trait_impls[p].get_list_for_type_mut(ptr->m_type);
            trait_impl_list_r.push_back(ptr.get());
            auto& trait_impl_list   = crate.m_trait_impls[p].get_list_for_type_mut(ptr->m_type);
            trait_impl_list.push_back(mv$(ptr));
            };
        for(auto& impl : this->impls_closure)
        {
            switch(impl.first)
            {
            case ::HIR::ExprNode_Closure::Class::Once:
                DEBUG("impl" << impl.second.m_params.fmt_args() << " FnOnce" << impl.second.m_trait_args << " for " << impl.second.m_type);
                push_trait_impl(crate.get_lang_item_path(sp, "fn_once"), box$(impl.second));
                break;
            case ::HIR::ExprNode_Closure::Class::Mut:
                DEBUG("impl" << impl.second.m_params.fmt_args() << " FnMut" << impl.second.m_trait_args << " for " << impl.second.m_type);
                push_trait_impl(crate.get_lang_item_path(sp, "fn_mut" ), box$(impl.second));
                break;
            case ::HIR::ExprNode_Closure::Class::Shared:
                DEBUG("impl" << impl.second.m_params.fmt_args() << " Fn" << impl.second.m_trait_args << " for " << impl.second.m_type);
                push_trait_impl(crate.get_lang_item_path(sp, "fn"     ), box$(impl.second));
                break;
            case ::HIR::ExprNode_Closure::Class::NoCapture:
                BUG(sp, "");
                break;
            case ::HIR::ExprNode_Closure::Class::Unknown:
                BUG(Span(), "Encountered Unkown closure type in new impls");
                break;
            }
        }
        for(auto& ptr : this->impls_type)
        {
            // NOTE: This should always have a name
            const auto& path = ptr->m_type.data().as_Path().path.m_data.as_Generic().m_path;
            DEBUG("Adding type impl" << ptr->m_params.fmt_args() << " " << ptr->m_type);
            crate.m_all_type_impls.named[path].push_back( ptr.get() );
            crate.m_type_impls.named[path].push_back( mv$(ptr) );
        }
        for(auto& impl : this->trait_impls)
        {
            check_state(impl.second);
            push_trait_impl( crate.get_lang_item_path(sp, impl.first), box$(impl.second) );
        }
        this->impls_closure.resize(0);
        this->trait_impls.resize(0);
    }

    /// Mutate the contents of a closure to update captures, variables, and types
    class ExprVisitor_Mutate:
        public ::HIR::ExprVisitorDef
    {
        const ::HIR::TypeRef&   m_closure_type;
        const ::std::vector<unsigned int>&  m_local_vars;
        const ::std::vector< ::HIR::ExprNode_Closure::AvuCache::Capture>&  m_captures;

        const Monomorphiser& m_monomorphiser;

        ::HIR::ExprNodeP    m_replacement;
    public:
        ExprVisitor_Mutate(
            const ::HIR::TypeRef& closure_type,
            const ::std::vector<unsigned int>& local_vars,
            const ::std::vector< ::HIR::ExprNode_Closure::AvuCache::Capture >& captures,
            const Monomorphiser& mcb
            )
            :
            m_closure_type(closure_type),
            m_local_vars(local_vars),
            m_captures(captures),
            m_monomorphiser(mcb)
        {
        }

        void visit_pattern(const Span& sp, ::HIR::Pattern& pat) override {
            for(auto& pb : pat.m_bindings)
            {
                auto binding_it = ::std::find(m_local_vars.begin(), m_local_vars.end(), pb.m_slot);
                if( binding_it != m_local_vars.end() ) {
                    // NOTE: Offset of 1 is for `self` (`args` is destructured)
                    pb.m_slot = 1 + (binding_it - m_local_vars.begin());
                }
                else {
                    BUG(sp, "Pattern binds to non-local - " << pb);
                }
            }

            if(auto* e = pat.m_data.opt_SplitSlice())
            {
                if( e->extra_bind.is_valid() )
                {
                    auto binding_it = ::std::find(m_local_vars.begin(), m_local_vars.end(), e->extra_bind.m_slot);
                    if( binding_it != m_local_vars.end() ) {
                        // NOTE: Offset of 1 is for `self` (`args` is destructured)
                        e->extra_bind.m_slot = 1 + (binding_it - m_local_vars.begin());
                    }
                    else {
                        BUG(sp, "Pattern (split slice extra) binds to non-local - " << e->extra_bind);
                    }
                }
            }

            ::HIR::ExprVisitorDef::visit_pattern(sp, pat);
        }

        void visit_type(::HIR::TypeRef& ty) override {
            DEBUG(ty);
            ty = m_monomorphiser.monomorph_type(Span(), ty, /*allow_infer=*/true);
        }

        void visit_path_params(::HIR::PathParams& pp) override {
            pp = m_monomorphiser.monomorph_path_params(Span(), pp, /*allow_infer*/false);
        }

        void visit_node_ptr(::HIR::ExprNodeP& node_ptr) override {
            assert( node_ptr );
            auto& node = *node_ptr;
            const char* node_ty = typeid(node).name();
            TRACE_FUNCTION_FR("[_Mutate] " << &node << " " << node_ty << " : " << node.m_res_type, node_ty);
            node.visit(*this);

            if( m_replacement ) {
                node_ptr = mv$(m_replacement);
            }

            visit_type( node_ptr->m_res_type );
        }
        void visit(::HIR::ExprNode_Closure& node) override
        {
            assert( ! node.m_code );

            // Fix params in path
            visit_generic_path( ::HIR::Visitor::PathContext::VALUE, node.m_obj_path );
            // Visit captures
            for(auto& subnode : node.m_captures)
            {
                visit_node_ptr(subnode);
            }
        }
        void visit(::HIR::ExprNode_Variable& node) override
        {
            // 1. Is it a closure-local?
            {
                auto binding_it = ::std::find(m_local_vars.begin(), m_local_vars.end(), node.m_slot);
                if( binding_it != m_local_vars.end() ) {
                    // NOTE: Offset of 1 is for `self` (`args` is destructured)
                    auto new_slot = 1 + binding_it - m_local_vars.begin();
                    DEBUG("_Variable: #" << node.m_slot << " -> #" << new_slot);
                    node.m_slot = new_slot;
                    return ;
                }
            }

            // 2. Is it a capture?
            {
                auto binding_it = ::std::find_if(m_captures.begin(), m_captures.end(),
                    [&](const HIR::ExprNode_Closure::AvuCache::Capture& x){return x.root_slot == node.m_slot;});
                if( binding_it != m_captures.end() )
                {
                    ASSERT_BUG(node.span(), binding_it->fields.empty(), "Reached _Variable for a field capture");
                    m_replacement = NEWNODE(node.m_res_type.clone(), Field, node.span(),
                        get_self(node.span()),
                        RcString::new_interned(FMT(binding_it - m_captures.begin()))
                        );
                    if( binding_it->usage != ::HIR::ValueUsage::Move ) {
                        auto bt = (binding_it->usage == ::HIR::ValueUsage::Mutate ? ::HIR::BorrowType::Unique : ::HIR::BorrowType::Shared);

                        visit_type(m_replacement->m_res_type);
                        m_replacement->m_res_type = ::HIR::TypeRef::new_borrow( bt, mv$(m_replacement->m_res_type) );
                        m_replacement = NEWNODE(node.m_res_type.clone(), Deref, node.span(),  mv$(m_replacement));
                    }
                    m_replacement->m_usage = node.m_usage;
                    DEBUG("_Variable: #" << node.m_slot << " -> capture");
                    return ;
                }
            }

            BUG(node.span(), "Encountered non-captured and unknown-origin variable - " << node.m_name << " #" << node.m_slot);
        }
        void visit(::HIR::ExprNode_Field& node) override
        {
            // NOTE: The logic here matches the logic in `annotate_value_usage.cpp`
            ::std::vector<RcString> fields;
            fields.push_back(node.m_field);

            // Extract a chain of field names
            auto* inner = node.m_value.get();
            while( auto* inner_field = dynamic_cast<::HIR::ExprNode_Field*>(inner) ) {
                fields.push_back(inner_field->m_field);
                inner = inner_field->m_value.get();
            }
            if( auto* inner_deref = dynamic_cast<::HIR::ExprNode_Deref*>(inner) ) {
                fields.push_back(RcString());
                inner = inner_deref->m_value.get();
            }
            // and if the final value is a variable, then insert into the captures
            if( auto* inner_var = dynamic_cast<::HIR::ExprNode_Variable*>(inner) ) {
                std::reverse(fields.begin(), fields.end());

                auto binding_it = ::std::find_if(m_captures.begin(), m_captures.end(),
                    [&](const HIR::ExprNode_Closure::AvuCache::Capture& x){return x.root_slot == inner_var->m_slot && x.fields == fields;});
                if( binding_it != m_captures.end() )
                {
                    m_replacement = NEWNODE(node.m_res_type.clone(), Field, node.span(),
                        get_self(node.span()),
                        RcString::new_interned(FMT(binding_it - m_captures.begin()))
                    );
                    if( binding_it->usage != ::HIR::ValueUsage::Move ) {
                        auto bt = (binding_it->usage == ::HIR::ValueUsage::Mutate ? ::HIR::BorrowType::Unique : ::HIR::BorrowType::Shared);

                        visit_type(m_replacement->m_res_type);
                        m_replacement->m_res_type = ::HIR::TypeRef::new_borrow( bt, mv$(m_replacement->m_res_type) );
                        m_replacement = NEWNODE(node.m_res_type.clone(), Deref, node.span(),  mv$(m_replacement));
                    }
                    m_replacement->m_usage = node.m_usage;
                    DEBUG("_Field: #" << inner_var->m_slot << fields << " -> capture");
                    return ;
                }
            }

            ::HIR::ExprVisitorDef::visit(node);
        }

        void visit(HIR::ExprNode_ConstParam& node) override {
            node.m_binding = m_monomorphiser.get_value(node.span(), HIR::GenericRef("", node.m_binding)).as_Generic().binding;
        }

        ::HIR::ExprNodeP get_self(const Span& sp) const
        {
            ::HIR::ExprNodeP    self;
            switch( m_closure_type.data().as_NodeType().as_Closure()->m_class )
            {
            case ::HIR::ExprNode_Closure::Class::Unknown:
                // Assume it's NoCapture
            case ::HIR::ExprNode_Closure::Class::NoCapture:
            case ::HIR::ExprNode_Closure::Class::Shared:
                self = NEWNODE(m_closure_type.clone(), Deref, sp,
                    NEWNODE( ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Shared, m_closure_type.clone()), Variable, sp, rcstring_self, 0)
                    );
                break;
            case ::HIR::ExprNode_Closure::Class::Mut:
                self = NEWNODE(m_closure_type.clone(), Deref, sp,
                    NEWNODE( ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Unique, m_closure_type.clone()), Variable, sp, rcstring_self, 0)
                    );
                break;
            case ::HIR::ExprNode_Closure::Class::Once:
                self = NEWNODE(m_closure_type.clone(), Variable, sp, rcstring_self, 0);
                break;
            }
            return self;
        }
    };

    /// Visitor to replace closure types with actual type
    class ExprVisitor_Fixup:
        public ::HIR::ExprVisitorDef
    {
    public:
        const ::HIR::Crate& m_crate;
        StaticTraitResolve  m_resolve;
        const Monomorphiser&    m_monomorphiser;
        const OutState* m_out;
        bool    m_run_eat;
    public:
        ExprVisitor_Fixup(const ::HIR::Crate& crate, const ::HIR::GenericParams* params, const Monomorphiser& monomorphiser, const OutState* out):
            m_crate(crate),
            m_resolve(crate),
            m_monomorphiser( monomorphiser ),
            m_out(out),
            m_run_eat(false)
        {
            if( params ) {
                m_resolve.set_impl_generics_raw(MetadataType::None, *params);   // Closure types are sized
                m_run_eat = true;
            }
        }

        void visit_root(::HIR::ExprPtr& root)
        {
            TRACE_FUNCTION;

            root->visit(*this);
            visit_type(root->m_res_type);

            for(auto& ty : root.m_bindings) {
                visit_type(ty);
                DEBUG("Local " << ty);
            }

            for(auto& ty : root.m_erased_types) {
                visit_type(ty);
                DEBUG("Erased " << ty);
            }
        }

        void visit_node_ptr(::HIR::ExprNodeP& node) override
        {
            node->visit(*this);
            visit_type(node->m_res_type);
        }

        void visit(::HIR::ExprNode_Cast& node) override
        {
            const Span& sp = node.span();
            // Handle casts from closures to function pointers
            if( TU_TEST1(node.m_value->m_res_type.data(), NodeType, .is_Closure()) )
            {
                TRACE_FUNCTION_FR("_Cast: " << &node << " " << node.m_value->m_res_type, node.m_value->m_res_type);

                const auto* src_nodep = node.m_value->m_res_type.data().as_NodeType().as_Closure();
                ASSERT_BUG(sp, src_nodep, "");
                const auto& src_node = *src_nodep;
                ASSERT_BUG(sp, node.m_res_type.data().is_Function(), "Cannot convert closure to non-fn type");
                //const auto& dte = node.m_res_type.m_data.as_Function();
                if( src_node.m_class != ::HIR::ExprNode_Closure::Class::NoCapture )
                {
                    ERROR(sp, E0000, "Cannot cast a closure with captures to a fn() type");
                }

                // TODO: Store a path on the closure node to avoid issues with leakage.
                // - If a closure defined in a closure leaks to its parent, its types will be mangled such that they're no longer valid.

                // - Get the result type (can't use `get_value` as that won't find the still-to-be stored impls)

                // - Get the new PathValue
                const auto& str = *src_node.m_obj_ptr;
                auto closure_type = ::HIR::TypeRef::new_path( src_node.m_obj_path.clone(), &str );
                auto fn_path = ::HIR::Path(mv$(closure_type), rcstring_call_free);
                fn_path.m_data.as_UfcsInherent().impl_params = src_node.m_obj_path.m_params.clone();

                const ::HIR::Function*    fcn_ptr = nullptr;
                if( m_out ) {
                    for(const auto& impl : m_out->impls_type)
                    {
                        const auto& path = impl->m_type.data().as_Path().path.m_data.as_Generic().m_path;
                        if( src_node.m_obj_path.m_path == path ) {
                            fcn_ptr = &impl->m_methods.begin()->second.data;
                        }
                    }
                }
                else {
                    TODO(node.span(), "Use get_value");
                }
                ASSERT_BUG(node.span(), fcn_ptr, "No function found?");

                auto res_ty = ::HIR::TypeRef(::HIR::TypeData::make_NamedFunction({ fn_path.clone(), fcn_ptr }));

                DEBUG("PathValue " << fn_path);
                node.m_value = NEWNODE(mv$(res_ty), PathValue, sp, mv$(fn_path), ::HIR::ExprNode_PathValue::FUNCTION);
            }
            ::HIR::ExprVisitorDef::visit(node);
        }

        void visit(::HIR::ExprNode_CallValue& node) override
        {
            if( const auto* node_pp = TU_OPT1(node.m_value->m_res_type.data(), NodeType, .opt_Closure()) )
            {
                switch((*node_pp)->m_class)
                {
                case ::HIR::ExprNode_Closure::Class::Unknown:
                    BUG(node.span(), "References an ::Unknown closure");
                case ::HIR::ExprNode_Closure::Class::NoCapture:
                case ::HIR::ExprNode_Closure::Class::Shared:
                    node.m_trait_used = ::HIR::ExprNode_CallValue::TraitUsed::Fn;
                    break;
                case ::HIR::ExprNode_Closure::Class::Mut:
                    node.m_trait_used = ::HIR::ExprNode_CallValue::TraitUsed::FnMut;
                    break;
                case ::HIR::ExprNode_Closure::Class::Once:
                    node.m_trait_used = ::HIR::ExprNode_CallValue::TraitUsed::FnOnce;
                    break;
                }
            }

            ::HIR::ExprVisitorDef::visit(node);
        }

        void visit_type(::HIR::TypeRef& ty) override
        {
            struct M: MonomorphiserNop {
                const Monomorphiser&    monomorphiser;
                M(const Monomorphiser& monomorphiser): monomorphiser(monomorphiser) {}
                ::HIR::TypeRef monomorph_type(const Span& sp, const ::HIR::TypeRef& ty, bool allow_infer) const override {
                    if( const auto* e = ty.data().opt_NodeType() )
                    {
                        TU_MATCH_HDRA((*e), {)
                        TU_ARMA(Closure, node_p) {
                            DEBUG("Closure: " << node_p->m_obj_path_base); // TODO: Why does this use the `_base`
                            auto path = monomorphiser.monomorph_genericpath(sp, node_p->m_obj_path_base, false);
                            const auto& str = *node_p->m_obj_ptr;
                            DEBUG(ty << " -> " << path);
                            return ::HIR::TypeRef::new_path( mv$(path), ::HIR::TypePathBinding::make_Struct(&str) );
                            }
                        TU_ARMA(Generator, node_p) {
                            DEBUG("Generator: " << node_p->m_obj_path);
                            auto path = monomorphiser.monomorph_genericpath(sp, node_p->m_obj_path, false);
                            const auto& str = *node_p->m_obj_ptr;
                            DEBUG(ty << " -> " << path);
                            return ::HIR::TypeRef::new_path( mv$(path), ::HIR::TypePathBinding::make_Struct(&str) );
                            }
                        TU_ARMA(Async, node_p) {
                            DEBUG("Async: " << node_p->m_obj_path);
                            auto path = monomorphiser.monomorph_genericpath(sp, node_p->m_obj_path, false);
                            const auto& str = *node_p->m_obj_ptr;
                            DEBUG(ty << " -> " << path);
                            return ::HIR::TypeRef::new_path( mv$(path), ::HIR::TypePathBinding::make_Struct(&str) );
                            }
                        }
                    }

                    auto rv = MonomorphiserNop::monomorph_type(sp, ty, allow_infer);
                    if( auto* e = rv.data_mut().opt_Path() )
                    {
                        if( e->binding.is_Unbound() && e->path.m_data.is_UfcsKnown() )
                        {
                            e->binding = ::HIR::TypePathBinding::make_Opaque({});
                        }
                    }
                    return rv;
                }
            } m(m_monomorphiser);
            ty = m.monomorph_type(Span(), ty, true);
        }
    };

    struct H {
        static void fix_fn_params(::HIR::ExprPtr& code, const ::HIR::TypeRef& self_ty, const ::HIR::TypeRef& args_ty)
        {
            // TODO: The self_ty here is wrong, the borrow needs to be included.
            if( code.m_bindings.size() == 0 ) {
                // No bindings - Wrapper function
                // Insert 0 = Self, 1 = Args
                code.m_bindings.push_back( self_ty.clone() );
                code.m_bindings.push_back( args_ty.clone() );
            }
            else {
                // Bindings present - Actual code (which destructures `args`)
                assert( code.m_bindings.size() >= 1 );
                assert( code.m_bindings[0] == ::HIR::TypeRef() );
                code.m_bindings[0] = self_ty.clone();
            }
        }
        static ::HIR::TypeImpl make_fnfree(
                ::HIR::GenericParams params,
                ::HIR::TypeRef closure_type,
                ::std::vector<::std::pair< ::HIR::Pattern, ::HIR::TypeRef>> args,
                ::HIR::TypeRef ret_ty,
                ::HIR::ExprPtr code
            )
        {
            // NOTE: Fixup isn't needed, there's no self
            //fix_fn_params(code, closure_type, args_argent.second);
            assert(code.m_bindings.size() > 0);
            code.m_bindings[0] = ::HIR::TypeRef::new_unit();
            return ::HIR::TypeImpl {
                std::move(params),
                std::move(closure_type),
                make_map1(
                    rcstring_call_free, ::HIR::TypeImpl::VisImplEnt< ::HIR::Function> {
                        ::HIR::Publicity::new_global(),
                        false,
                        ::HIR::Function( ::HIR::Function::Receiver::Free, ::HIR::GenericParams {}, mv$(args), ret_ty.clone(), mv$(code))
                        }
                    ),
                {},
                ::HIR::SimplePath()
                };
        }
        static ::HIR::TraitImpl make_fnonce(
                ::HIR::GenericParams params,
                ::HIR::PathParams trait_params,
                ::HIR::TypeRef closure_type,
                ::std::pair< ::HIR::Pattern, ::HIR::TypeRef> args_argent,
                ::HIR::TypeRef ret_ty,
                ::HIR::ExprPtr code
            )
        {
            auto ty_of_self = closure_type.clone();
            fix_fn_params(code, ty_of_self, args_argent.second);
            return ::HIR::TraitImpl {
                mv$(params), mv$(trait_params), mv$(closure_type),
                make_map1(
                    rcstring_call_once, ::HIR::TraitImpl::ImplEnt< ::HIR::Function> { false, ::HIR::Function {
                        ::HIR::Function::Receiver::Value,
                        ::HIR::GenericParams {},
                        make_vec2(
                            ::std::make_pair(
                                ::HIR::Pattern { HIR::PatternBinding {false, ::HIR::PatternBinding::Type::Move, rcstring_self, 0}, {} },
                                mv$(ty_of_self)
                                ),
                            mv$( args_argent )
                            ),
                        ret_ty.clone(),
                        mv$(code)
                        } }
                    ),
                {},
                {},
                make_map1(
                    RcString::new_interned("Output"), ::HIR::TraitImpl::ImplEnt< ::HIR::TypeRef> { false, mv$(ret_ty) }
                    ),
                ::HIR::SimplePath()
                };
        }
        static ::HIR::TraitImpl make_fnmut(
                ::HIR::GenericParams params,
                ::HIR::PathParams trait_params,
                ::HIR::TypeRef closure_type,
                ::std::pair< ::HIR::Pattern, ::HIR::TypeRef> args_argent,
                ::HIR::TypeRef ret_ty,
                ::HIR::ExprPtr code
            )
        {
            ::HIR::GenericParams fcn_params;
            fcn_params.m_lifetimes.push_back(HIR::LifetimeDef());
            auto ty_of_self = ::HIR::TypeRef::new_borrow( ::HIR::BorrowType::Unique, closure_type.clone(), HIR::LifetimeRef(256 + 0) );
            fix_fn_params(code, ty_of_self, args_argent.second);
            return ::HIR::TraitImpl {
                mv$(params), mv$(trait_params), mv$(closure_type),
                make_map1(
                    rcstring_call_mut, ::HIR::TraitImpl::ImplEnt< ::HIR::Function> { false, ::HIR::Function {
                        ::HIR::Function::Receiver::BorrowUnique,
                        mv$(fcn_params),
                        make_vec2(
                            ::std::make_pair(
                                ::HIR::Pattern { {false, ::HIR::PatternBinding::Type::Move, rcstring_self, 0}, {} },
                                mv$(ty_of_self)
                                ),
                            mv$( args_argent )
                            ),
                        ret_ty.clone(),
                        mv$(code)
                        } }
                    ),
                {},
                {},
                {},
                ::HIR::SimplePath()
                };
        }
        static ::HIR::TraitImpl make_fn(
                ::HIR::GenericParams params,
                ::HIR::PathParams trait_params,
                ::HIR::TypeRef closure_type,
                ::std::pair< ::HIR::Pattern, ::HIR::TypeRef> args_argent,
                ::HIR::TypeRef ret_ty,
                ::HIR::ExprPtr code
            )
        {
            auto ty_of_self = ::HIR::TypeRef::new_borrow( ::HIR::BorrowType::Shared, closure_type.clone() );
            fix_fn_params(code, ty_of_self, args_argent.second);
            return ::HIR::TraitImpl {
                mv$(params), mv$(trait_params), mv$(closure_type),
                make_map1(
                    rcstring_call, ::HIR::TraitImpl::ImplEnt< ::HIR::Function> { false, ::HIR::Function {
                        ::HIR::Function::Receiver::BorrowShared,
                        ::HIR::GenericParams {},
                        make_vec2(
                            ::std::make_pair(
                                ::HIR::Pattern { {false, ::HIR::PatternBinding::Type::Move, rcstring_self, 0}, {} },
                                mv$(ty_of_self)
                                ),
                            mv$(args_argent)
                            ),
                        ret_ty.clone(),
                        mv$(code)
                        } }
                    ),
                {},
                {},
                {},
                ::HIR::SimplePath()
                };
        }
    };

    /// Extract closures from the main tree
    class ExprVisitor_Extract:
        public ::HIR::ExprVisitorDef
    {
        const StaticTraitResolve& m_resolve;
        const ::HIR::TypeRef*   m_self_type;
        const ::std::vector< ::HIR::TypeRef>& m_variable_types;
        const ::HIR::ExprPtr& m_expr_ptr;

        // Outputs
        OutState&   m_out;
        const char* m_new_type_suffix;

    public:
        ExprVisitor_Extract(const StaticTraitResolve& resolve, const ::HIR::TypeRef* self_type, const ::std::vector< ::HIR::TypeRef>& var_types, const ::HIR::ExprPtr& expr_ptr, OutState& out, const char* new_type_suffix):
            m_resolve(resolve),
            m_self_type(self_type),
            m_variable_types(var_types),
            m_expr_ptr(expr_ptr),
            m_out(out),
            m_new_type_suffix(new_type_suffix)
        {
        }

        void visit_root(::HIR::ExprNode& root)
        {
            root.visit(*this);
        }

        struct Monomorph: public Monomorphiser
        {
            const StaticTraitResolve& resolve;
            ::HIR::GenericParams& params;
            ::HIR::PathParams& constructor_path_params;
            enum class Mode {
                Args,
                Return,
                Body,
            } mode = Mode::Body;
            bool m_frozen = false;
            HIR::LifetimeRef    m_capture_lifetime;
            mutable std::map<uint32_t, HIR::LifetimeRef>    m_lifetime_mappings;
            // A set of bounds that have already been added to `params` - used to allow looping
            std::set<const HIR::GenericBound*>    m_added_bounds;

            Monomorph(const StaticTraitResolve& resolve, ::HIR::GenericParams& params, ::HIR::PathParams& constructor_path_params)
                : resolve(resolve)
                , params(params)
                , constructor_path_params(constructor_path_params)
            {
            }

            ::HIR::PathParams freeze() {
                m_frozen = true;
                return constructor_path_params.clone();
            }

            ::HIR::TypeRef get_type(const Span& sp, const ::HIR::GenericRef& ge) const override {
                size_t rv = SIZE_MAX;
                ASSERT_BUG(sp, constructor_path_params.m_types.size() == params.m_types.size(), "");
                for(size_t i = 0; i < constructor_path_params.m_types.size(); i++) {
                    const auto& t = constructor_path_params.m_types[i];
                    if( t.data().is_Generic() && t.data().as_Generic() == ge ) {
                        rv = i;
                        DEBUG("Use param: " << ::HIR::TypeRef(params.m_types[rv].m_name, rv));
                        break;
                    }
                }
                if(rv == SIZE_MAX)
                {
                    ASSERT_BUG(sp, !m_frozen, "get_type would add a new param after freeze - " << ge);
                    rv = constructor_path_params.m_types.size();
                    DEBUG("Add param: " << ::HIR::TypeRef(ge.name, rv) << " <- " << ge);
                    constructor_path_params.m_types.push_back(HIR::TypeRef(ge.name, ge.binding));
                    params.m_types.push_back(::HIR::TypeParamDef());
                    //params.m_types.back().m_is_sized = true;
                    params.m_types.back().m_is_sized = resolve.type_is_sized(sp, constructor_path_params.m_types.back());
                    params.m_types.back().m_name = ge.name;
                }
                ASSERT_BUG(sp, rv < params.m_types.size(), ge << " -> " << rv << " < " << params.m_types.size());
                return ::HIR::TypeRef(params.m_types[rv].m_name, rv);
            }
            ::HIR::ConstGeneric get_value(const Span& sp, const ::HIR::GenericRef& ge) const {
                size_t rv = SIZE_MAX;
                for(size_t i = 0; i < constructor_path_params.m_values.size(); i++) {
                    const auto& v = constructor_path_params.m_values[i];
                    if( v.is_Generic() && v.as_Generic() == ge ) {
                        rv = i;
                        break;
                    }
                }
                if(rv == SIZE_MAX)
                {
                    ASSERT_BUG(sp, !m_frozen, "get_value would add a new param after freeze - " << ge);
                    rv = constructor_path_params.m_values.size();
                    constructor_path_params.m_values.push_back(ge);
                    params.m_values.push_back(::HIR::ValueParamDef());
                    params.m_values.back().m_name = ge.name;
                }
                return ::HIR::ConstGeneric::make_Generic({params.m_values[rv].m_name, static_cast<uint32_t>(rv)});
            }
            ::HIR::LifetimeRef get_lifetime(const Span& sp, const ::HIR::GenericRef& ge) const override {
                size_t rv = SIZE_MAX;
                for(size_t i = 0; i < constructor_path_params.m_lifetimes.size(); i++) {
                    const auto& v = constructor_path_params.m_lifetimes[i];
                    if( v.binding == ge.binding ) {
                        rv = i;
                        break;
                    }
                }
                if( ge.group() == 0 )
                    ASSERT_BUG(sp, resolve.m_impl_generics && ge.idx() < resolve.m_impl_generics->m_lifetimes.size(), "Unexpected impl generic lifetime - " << ge);
                if( ge.group() == 1 )
                    ASSERT_BUG(sp, resolve.m_item_generics && ge.idx() < resolve.m_item_generics->m_lifetimes.size(), "Unexpected item generic lifetime - " << ge);
                ASSERT_BUG(sp, ge.group() < 2, "Unexpected HRL/placeholder - " << ge);
                if(rv == SIZE_MAX)
                {
                    ASSERT_BUG(sp, !m_frozen, "get_lifetime would add a new param after freeze - " << ge);
                    rv = constructor_path_params.m_lifetimes.size();
                    constructor_path_params.m_lifetimes.push_back(ge.binding);
                    DEBUG("ADD lifetime 'I:" << rv << " = " << constructor_path_params.m_lifetimes.back());
                    params.m_lifetimes.push_back(::HIR::LifetimeDef());
                    //params.m_values.back().m_name = ge.name;
                }
                return ::HIR::LifetimeRef(rv);
            }

            ::HIR::TypeRef monomorph_type(const Span& sp, const ::HIR::TypeRef& tpl, bool allow_infer=true) const override {
                //if( const auto* te = tpl.data().opt_Closure() ) {
                //    this->monomorph_genericpath(sp, te->node->m_obj_path, allow_infer);
                //}
                return Monomorphiser::monomorph_type(sp, tpl, allow_infer);
            }

            ::HIR::LifetimeRef monomorph_lifetime(const Span& sp, const ::HIR::LifetimeRef& tpl) const override {
                // TODO: Custom impl that renumbers local lifetimes into the new list, and handles arguments/return into impl
                // - Have a list of lifetimes from arguments and returns
                switch(tpl.binding)
                {
                case HIR::LifetimeRef::UNKNOWN:
                case HIR::LifetimeRef::INFER:
                    BUG(sp, "Found unbound lifetime when monomorphising closure? " << tpl);
                    break;
                case HIR::LifetimeRef::STATIC:
                    return tpl;
                default:
                    if( tpl.is_param() ) {
                        return Monomorphiser::monomorph_lifetime(sp, tpl);
                    }
                    else {
                        auto it = m_lifetime_mappings.find(tpl.binding);
                        if( it != m_lifetime_mappings.end() ) {
                            return it->second;
                        }
                        switch(mode)
                        {
                        case Mode::Args: {
                            // Allocate a new lifetime param
                            auto idx = params.m_lifetimes.size();
                            params.m_lifetimes.push_back(HIR::LifetimeDef());
                            constructor_path_params.m_lifetimes.push_back(tpl);
                            DEBUG("Allocate lifetime: 'I" << idx << " = " << tpl);
                            m_lifetime_mappings.insert(std::make_pair( tpl.binding, ::HIR::LifetimeRef(idx) ));
                            return ::HIR::LifetimeRef(idx);
                        }
                        case Mode::Return:
                            // NOTE: This return is probably good, but the unification of captures might be iffy.
                            // - TODO: Would be nice to use different lifetime params for each capture.
                            return m_capture_lifetime;
                        case Mode::Body:
                            // Unset body types
                            return HIR::LifetimeRef();
                        }
                        throw "unreachable";
                    }
                }
            }

            void maybe_monomorph_bound(const Span& sp, const HIR::GenericBound& bound) {
                // Determine if the bound relates to any of the types in the list.
                // - This helps reduce the number of generics captured (which is needed for lifetimes)
                if( bound_needed(sp, bound) ) {
                    if( m_added_bounds.insert(&bound).second ) {
                        DEBUG("-- Bound added " << bound);
                        auto new_b = monomorph_bound(sp, bound);
                        params.m_bounds.push_back( mv$(new_b) );
                    }
                }
                else {
                    DEBUG("-- Bound un-used " << bound);
                }
            }
            void add_bounds(const Span& sp, const StaticTraitResolve& resolve) {
                assert(&resolve == &this->resolve);
                // Loop until no new bounds are added
                // This handles the case where a bound adds a new generic, which then needs previously-visited bounds
                size_t l = SIZE_MAX;
                while(l != params.m_bounds.size())
                {
                    l = params.m_bounds.size();
                    for(const auto& bound : resolve.impl_generics().m_bounds ) {
                        maybe_monomorph_bound(sp, bound);
                    }
                    for(const auto& bound : resolve.item_generics().m_bounds ) {
                        maybe_monomorph_bound(sp, bound);
                    }
                }

                DEBUG("constructor_path_params = " << constructor_path_params);
                for(size_t i = 0; i < constructor_path_params.m_types.size(); i ++) {
                    DEBUG("-- constructor_path_params Type: " << constructor_path_params.m_types[i]);
                    params.m_types[i].m_is_sized = resolve.type_is_sized(sp, constructor_path_params.m_types[i]);
                }
                for(size_t i = 0; i < constructor_path_params.m_values.size(); i ++) {
                    DEBUG("-- constructor_path_params Value: " << constructor_path_params.m_values[i]);
                    params.m_values[i].m_type = resolve.get_const_param_type(sp, constructor_path_params.m_values[i].as_Generic().binding).clone();
                }
                DEBUG("params = " << params.fmt_args());
            }
        private:
            template<typename T, typename U>
            static bool contains(const ::std::vector<T>& l, const U& v) {
                return ::std::find(l.begin(), l.end(), v) != l.end();
            }
            template<typename T, typename U>
            static bool contains(const ThinVector<T>& l, const U& v) {
                return ::std::find(l.begin(), l.end(), v) != l.end();
            }
            enum class TypeNeed {
                // No generics used
                NoGenerics,
                // A non-referenced type is used - exclude
                UsesOthers,
                // A referenced type is used - must be included
                Required,
            };
            ::std::function<bool(const::HIR::TypeRef&)> get_needed_cb(TypeNeed& rv) const {
                // Only include if a used generic is present AND there are no unused generics
                // - Visit the type, if there's a generic then determine if the 
                return [this,&rv](const ::HIR::TypeRef& t)->bool {
                    if(t.data().is_Generic() ){
                        if(contains(constructor_path_params.m_types, t)) {
                            if( rv == TypeNeed::NoGenerics ) {
                                rv = TypeNeed::Required;
                            }
                        }
                        else {
                            // Trigger an early-return
                            rv = TypeNeed::UsesOthers;
                            return true;
                        }
                    }
                    return false;
                };
            }
            TypeNeed type_bound_needed(const Span& sp, const HIR::TypeRef& ty) const {
                // Only include if a used generic is present AND there are no unused generics
                // - Visit the type, if there's a generic then determine if the 
                auto rv = TypeNeed::NoGenerics;
                visit_ty_with(ty, get_needed_cb(rv));
                return rv;
            }
            TypeNeed type_bound_needed(const Span& sp, const HIR::GenericPath& tp) const {
                auto rv = TypeNeed::NoGenerics;
                for(const auto& ty : tp.m_params.m_types) {
                    visit_ty_with(ty, get_needed_cb(rv));
                }
                return rv;
            }
            TypeNeed type_bound_needed(const Span& sp, const HIR::TraitPath& tp) const {
                auto rv = TypeNeed::NoGenerics;
                visit_trait_path_tys_with(tp, get_needed_cb(rv));
                return rv;
            }
            bool bound_needed(const Span& sp, const ::HIR::GenericBound& b) const {
                TU_MATCH_HDRA( (b), {)
                TU_ARMA(Lifetime, e) {
                    if( e.test.is_param() && !contains(constructor_path_params.m_lifetimes, e.test))
                        return false;
                    if( e.valid_for.is_param() && !contains(constructor_path_params.m_lifetimes, e.valid_for))
                        return false;
                    return true;
                    }
                TU_ARMA(TypeLifetime, e) {
                    if( type_bound_needed(sp, e.type) != TypeNeed::Required )
                        return false;
                    if( e.valid_for.is_param() && !contains(constructor_path_params.m_lifetimes, e.valid_for))
                        return false;
                    return true;
                    }
                TU_ARMA(TraitBound, e) {
                    //if( type_bound_needed(sp, e.type) != TypeNeed::Required )
                    //    return false;
                    // Allows more complex type bounds
                    // e.g. `ty::Predicate<'tcx>: LowerInto<'tcx, std::option::Option<T>>,` (from 1.54 compiler/rustc_traits/src/chalk/db.rs:54)
                    if( type_bound_needed(sp, e.type) != TypeNeed::Required && type_bound_needed(sp, e.trait) != TypeNeed::Required )
                        return false;
                    // Check for an unused type omitted: `V: FromIterator<A>` `I: IntoIterator<Item=A>` - `A` is only used in the bounds.
#if 0
                    // Check that the bounds don't reference an unused type.
                    auto rv_tp = type_bound_needed(sp, e.trait);
                    //auto rv_tp = type_bound_needed(sp, e.trait.m_path);
                    if( rv_tp == TypeNeed::UsesOthers )
                        return false;
#endif
                    return true;
                    }
                TU_ARMA(TypeEquality, e) {
                    TODO(sp, "");
                    }
                }
                throw "";
            }
            ::HIR::GenericBound monomorph_bound(const Span& sp, const ::HIR::GenericBound& b) const {
                TU_MATCH_HDRA( (b), {)
                TU_ARMA(Lifetime, e)
                    return ::HIR::GenericBound::make_Lifetime({
                        this->monomorph_lifetime(sp, e.test),
                        this->monomorph_lifetime(sp, e.valid_for),
                        });
                TU_ARMA(TypeLifetime, e)
                    return ::HIR::GenericBound::make_TypeLifetime({ this->monomorph_type(sp, e.type), this->monomorph_lifetime(sp, e.valid_for) });
                TU_ARMA(TraitBound, e) {
                    const static HIR::GenericParams null_hrtbs;
                    auto _ = this->push_hrb(e.hrtbs ? *e.hrtbs : null_hrtbs);
                    return ::HIR::GenericBound::make_TraitBound  ({ (e.hrtbs ? box$(e.hrtbs->clone()) : nullptr), this->monomorph_type(sp, e.type), this->monomorph_traitpath(sp, e.trait, false) });
                    }
                TU_ARMA(TypeEquality, e)
                    return ::HIR::GenericBound::make_TypeEquality({ this->monomorph_type(sp, e.type), this->monomorph_type(sp, e.other_type) });
                }
                throw "";
            }
        };
        Monomorph create_params(const Span& sp, const StaticTraitResolve& resolve, ::HIR::GenericParams& params, ::HIR::PathParams& constructor_path_params) const
        {
            // TODO: How to get the bounds?
            // - Only want the bounds that relate to generics used.
            return Monomorph(resolve, params, constructor_path_params);
        }

        /// <summary>
        /// Main extraction closure visitor
        /// </summary>
        void visit(::HIR::ExprNode_Closure& node) override
        {
            if(!node.m_code)
            {
                DEBUG("Already expanded (via consteval?)");
                return ;
            }

            const auto& sp = node.span();

            TRACE_FUNCTION_F("Extract closure - " << node.m_res_type);

            ASSERT_BUG(sp, node.m_obj_path == ::HIR::GenericPath(), "Closure path already set? " << node.m_obj_path);

            ::HIR::ExprVisitorDef::visit(node);

            // --- Extract and mutate code into a trait impl on the closure type ---

            // TODO: Fix up lifetimes somehow
            //  - Convert any referenced lifetimes in arguments/return into impl params
            //  - Interior lifetimes need to be renumbered
            // - Need to have done lifetime inferrence (allocating locals to all) beforehand.

            // 1. Prepare type params for rewriting the expression tree
            ::HIR::GenericParams params;
            ::HIR::PathParams constructor_path_params;
            // TODO: Don't create using all inputs, instead only use the parameters required by the body
            auto monomorph_cb = create_params(sp, m_resolve, params, constructor_path_params);

            // Argument and return types
            ::std::vector< ::HIR::TypeRef>  args_ty_inner;
            monomorph_cb.mode = Monomorph::Mode::Args;
            for(const auto& arg : node.m_args) {
                DEBUG("> ARG " << arg.second);
                args_ty_inner.push_back( monomorph_cb.monomorph_type(sp, arg.second) );
            }
            monomorph_cb.mode = Monomorph::Mode::Return;
            ::HIR::TypeRef  args_ty { mv$(args_ty_inner) };
            DEBUG("> Return type: " << node.m_return);
            ::HIR::TypeRef  ret_type = monomorph_cb.monomorph_type(sp, node.m_return);
            DEBUG("args_ty = " << args_ty << ", ret_type = " << ret_type);
            monomorph_cb.mode = Monomorph::Mode::Body;

            DEBUG("params = " << params.fmt_args());

            DEBUG("--- Mutate inner code");
            // 2. Iterate over the nodes and rewrite variable accesses to either renumbered locals, or field accesses
            ExprVisitor_Mutate    ev { node.m_res_type, node.m_avu_cache.local_vars, node.m_avu_cache.captured_vars, monomorph_cb };
            ev.visit_node_ptr( node.m_code );
            // NOTE: `ev` is used down in `Args` to convert the argument destructuring pattern

            // - Types of local variables
            DEBUG("--- Build locals and captures");
            ::std::vector< ::HIR::TypeRef>  local_types;
            local_types.push_back( ::HIR::TypeRef() );  // self - filled by make_fn*
            for(const auto binding_idx : node.m_avu_cache.local_vars) {
                local_types.push_back( monomorph_cb.monomorph_type(sp, m_variable_types.at(binding_idx).clone()) );
            }
            // - Generate types of captures, and construct the actual capture values
            //  > Capture types (with borrows and using closure's type params)
            ::std::vector< ::HIR::VisEnt< ::HIR::TypeRef> > capture_types;
            //  > Capture value nodes
            ::std::vector< ::HIR::ExprNodeP>    capture_nodes;
            capture_types.reserve( node.m_avu_cache.captured_vars.size() );
            capture_nodes.reserve( node.m_avu_cache.captured_vars.size() );
            node.m_is_copy = true;
            for(const auto& binding : node.m_avu_cache.captured_vars)
            {
                auto binding_type = binding.usage;

                HIR::TypeRef    tmp_ty;
                const auto* cap_ty_p = &m_variable_types.at(binding.root_slot);
                auto val_node = NEWNODE(cap_ty_p->clone(), Variable,  sp, "", binding.root_slot);
                for(const auto& n : binding.fields) {
                    tmp_ty = m_resolve.get_field_type(sp, *cap_ty_p, n);
                    m_resolve.expand_associated_types(sp, tmp_ty);
                    cap_ty_p = &tmp_ty;
                    if( n == "" ) {
                        val_node = NEWNODE(cap_ty_p->clone(), Deref,  sp, std::move(val_node));
                    }
                    else {
                        val_node = NEWNODE(cap_ty_p->clone(), Field,  sp, std::move(val_node), n);
                    }
                }

                ::HIR::BorrowType   bt;
                const auto& cap_ty = *cap_ty_p;
                auto ty_mono = monomorph_cb.monomorph_type(sp, *cap_ty_p);

                DEBUG("Binding _#" << binding.root_slot << FMT_CB(ss, for(const auto& n : binding.fields) ss << "." << n) << " : " << binding_type);
                DEBUG(cap_ty << " -> " << ty_mono);
                switch(binding_type)
                {
                case ::HIR::ValueUsage::Unknown:
                    BUG(sp, "ValueUsage::Unkown on " << binding.root_slot);
                case ::HIR::ValueUsage::Borrow:
                    bt = ::HIR::BorrowType::Shared;
                    capture_nodes.push_back(NEWNODE( ::HIR::TypeRef::new_borrow(bt, cap_ty.clone(), HIR::LifetimeRef(HIR::LifetimeRef::MAX_LOCAL + 1)), Borrow,  sp, bt, mv$(val_node) ));
                    ty_mono = ::HIR::TypeRef::new_borrow(bt, mv$(ty_mono));
                    break;
                case ::HIR::ValueUsage::Mutate:
                    bt = ::HIR::BorrowType::Unique;
                    capture_nodes.push_back(NEWNODE( ::HIR::TypeRef::new_borrow(bt, cap_ty.clone(), HIR::LifetimeRef(HIR::LifetimeRef::MAX_LOCAL + 1)), Borrow,  sp, bt, mv$(val_node) ));
                    ty_mono = ::HIR::TypeRef::new_borrow(bt, mv$(ty_mono));
                    break;
                case ::HIR::ValueUsage::Move:
                    capture_nodes.push_back( mv$(val_node) );
                    break;
                }
                capture_types.push_back( ::HIR::VisEnt< ::HIR::TypeRef> { ::HIR::Publicity::new_none(), mv$(ty_mono) } );
            }
            assert( constructor_path_params.m_lifetimes.size() == params.m_lifetimes.size() );
            
            auto ref_capture_lft_idx = params.m_lifetimes.size();
            bool lifetime_needed = false;
            for(size_t i = 0; i < capture_types.size(); i ++)
            {
                auto binding_type = node.m_avu_cache.captured_vars[i].usage;
                auto& ty_mono = capture_types[i].ent;
                if( binding_type != ::HIR::ValueUsage::Move ) {
                    ty_mono.data_mut().as_Borrow().lifetime = HIR::LifetimeRef(ref_capture_lft_idx);
                    lifetime_needed = true;
                }
            }

            if( lifetime_needed ) {
                // Add `'a: 'captures` for all captured lifetimes
                for(size_t i = 0; i < params.m_lifetimes.size(); i++) {
                    params.m_bounds.push_back(::HIR::GenericBound::make_Lifetime({ HIR::LifetimeRef(params.m_lifetimes.size()), HIR::LifetimeRef(i) }));
                }
                params.m_lifetimes.push_back(HIR::LifetimeDef());
                params.m_lifetimes.back().m_name = RcString::new_interned("captures");
                DEBUG("Added by-borrow lifetime: #" << ref_capture_lft_idx << " - " << params.fmt_args());
                monomorph_cb.m_capture_lifetime = HIR::LifetimeRef(ref_capture_lft_idx);
                ASSERT_BUG(sp, node.m_capture_lifetime != HIR::LifetimeRef(), "Capture lifetime unset");
                constructor_path_params.m_lifetimes.push_back( node.m_capture_lifetime );
            }
            // Any lifetimes added need to be included (arguments and captures)
            assert( constructor_path_params.m_lifetimes.size() == params.m_lifetimes.size() );

            // --- ---
            // - Fix type to replace closure types with known paths
            {
                ExprVisitor_Fixup   fixup { m_resolve.m_crate, &params, monomorph_cb, &m_out };
                for(size_t i = 0; i < capture_types.size(); i ++)
                {
                    //auto binding_type = node.m_avu_cache.captured_vars[i].usage;
                    HIR::TypeRef& ty_mono = capture_types[i].ent;
                    fixup.m_resolve.expand_associated_types(sp, ty_mono);
                    fixup.visit_type(ty_mono);
                }
            }
            monomorph_cb.add_bounds(sp, m_resolve);
            DEBUG("params = " << params.fmt_args() << params.fmt_bounds());

            {
                StaticTraitResolve  local_resolve { m_resolve.m_crate };
                local_resolve.set_impl_generics_raw(MetadataType::None, params);   // Closure types are sized

                for(const auto& v : capture_types)
                {
                    if( !local_resolve.type_is_copy(sp, v.ent) )
                    {
                        DEBUG("Non-copy capture: " << v.ent);
                        node.m_is_copy = false;
                    }
                }
                if( node.m_is_copy )
                {
                    DEBUG("Copy closure");
                }
            }

            auto impl_path_params = params.make_nop_params(0);
            auto str = ::HIR::Struct {
                params.clone(),
                ::HIR::Struct::Repr::Rust,
                ::HIR::Struct::Data::make_Tuple(mv$(capture_types))
            };
            str.m_markings.is_copy = node.m_is_copy;
            ::HIR::SimplePath   closure_struct_path;
            const ::HIR::TypeItem* closure_struct_ptr;
            ::std::tie(closure_struct_path, closure_struct_ptr) = m_out.new_type(CLOSURE_PATH_PREFIX, m_new_type_suffix, mv$(str));
            const auto& closure_struct_ref = closure_struct_ptr->as_Struct();

            // Mark the object pathname in the closure.
            node.m_obj_ptr = &closure_struct_ref;
            node.m_obj_path = ::HIR::GenericPath( closure_struct_path, monomorph_cb.freeze() );
            node.m_obj_path_base = node.m_obj_path.clone();
            node.m_captures = mv$(capture_nodes);
            //node.m_res_type = ::HIR::TypeRef( node.m_obj_path.clone() );
            DEBUG("-- Object name: " << node.m_obj_path);
            ::HIR::TypeRef  closure_type = ::HIR::TypeRef::new_path(
                ::HIR::GenericPath(node.m_obj_path.m_path.clone(), mv$(impl_path_params)),
                ::HIR::TypePathBinding::make_Struct(&closure_struct_ref)
                );
            ::std::vector< ::HIR::Pattern>  args_pat_inner;
            for(const auto& arg : node.m_args) {
                args_pat_inner.push_back( arg.first.clone() );
                ev.visit_pattern(sp, args_pat_inner.back() );
            }
            ::HIR::Pattern  args_pat { HIR::PatternBinding(), ::HIR::Pattern::Data::make_Tuple({ mv$(args_pat_inner) }) };


            ::HIR::ExprPtr body_code { mv$(node.m_code) };
            body_code.m_bindings = mv$(local_types);

            {
                DEBUG("-- Fixing types in body code");
                ExprVisitor_Fixup   fixup { m_resolve.m_crate, &params, monomorph_cb, &m_out };
                fixup.visit_root( body_code );

                DEBUG("-- Fixing types in signature");
                fixup.visit_type( args_ty );
                fixup.visit_type( ret_type );
                // TODO: Replace erased types too
            }
            DEBUG("args_ty = " << args_ty << ", ret_type = " << ret_type);

            if( node.m_is_copy )
            {
                const auto& lang_Copy = m_resolve.m_crate.get_lang_item_path(sp, "copy");
                auto& v = const_cast<::HIR::Crate&>(m_resolve.m_crate).m_trait_impls[lang_Copy].get_list_for_type_mut(closure_type);
                v.push_back(box$(::HIR::TraitImpl {
                    params.clone(), {}, closure_type.clone(),
                    {},
                    {},
                    {},
                    {},
                    /*source module*/::HIR::SimplePath(m_resolve.m_crate.m_crate_name, {})
                    }));
                const_cast<::HIR::Crate&>(m_resolve.m_crate).m_all_trait_impls[lang_Copy].get_list_for_type_mut(closure_type).push_back( v.back().get() );
            }

            // ---
            // 3. Create trait impls
            // ---
            ::HIR::PathParams   trait_params;
            trait_params.m_types.push_back( args_ty.clone() );
            switch(node.m_class)
            {
            case ::HIR::ExprNode_Closure::Class::Unknown:
                node.m_class = ::HIR::ExprNode_Closure::Class::NoCapture;
            case ::HIR::ExprNode_Closure::Class::NoCapture: {
                DEBUG("class=NoCapture");

                struct H2 {
                    static ::std::pair<::HIR::ExprNode_Closure::Class, HIR::TraitImpl> make_dispatch(
                            const Span& sp,
                            ::HIR::ExprNode_Closure::Class c,
                            ::HIR::GenericParams params,
                            ::HIR::PathParams trait_params,
                            const ::HIR::TypeRef& closure_type,
                            const ::HIR::TypeRef& args_ty,
                            const ::HIR::TypeRef& ret_type
                            )
                    {
                        const auto& args_tup_inner = args_ty.data().as_Tuple();
                        // 1. Create a list of `arg.0, arg.1, arg.2, ...` for the dispatch methods
                        ::std::vector<HIR::ExprNodeP> dispatch_args;
                        ::std::vector<HIR::TypeRef> dispatch_node_args_cache;
                        dispatch_args.reserve( args_tup_inner.size() );
                        dispatch_node_args_cache.reserve( args_tup_inner.size()+1 );
                        for(size_t i = 0; i < args_tup_inner.size(); i ++)
                        {
                            const auto& ty = args_tup_inner[i];
                            dispatch_args.push_back( NEWNODE(ty.clone(), Field, sp,  NEWNODE(args_ty.clone(), Variable, sp, rcstring_arg, 1), RcString::new_interned(FMT(i))) );
                            dispatch_node_args_cache.push_back( ty.clone() );
                        }
                        dispatch_node_args_cache.push_back( ret_type.clone() );
                        auto path = ::HIR::Path(closure_type.clone(), rcstring_call_free);
                        path.m_data.as_UfcsInherent().impl_params = closure_type.data().as_Path().path.m_data.as_Generic().m_params.clone();
                        HIR::ExprNodeP  dispatch_node = NEWNODE(ret_type.clone(), CallPath, sp,
                                mv$(path),
                                mv$(dispatch_args)
                                );
                        dynamic_cast<::HIR::ExprNode_CallPath&>(*dispatch_node).m_cache.m_arg_types = mv$(dispatch_node_args_cache);

                        auto args_arg = ::std::make_pair(
                            ::HIR::Pattern { {false, ::HIR::PatternBinding::Type::Move, rcstring_args, 1}, {} },
                            args_ty.clone()
                            );
                        HIR::TraitImpl fcn;
                        switch(c)
                        {
                        case ::HIR::ExprNode_Closure::Class::Once:
                            fcn = H::make_fnonce( mv$(params), mv$(trait_params), closure_type.clone(), mv$(args_arg), ret_type.clone(), mv$(dispatch_node) );
                            break;
                        case ::HIR::ExprNode_Closure::Class::Mut:
                            fcn = H::make_fnmut( mv$(params), mv$(trait_params), closure_type.clone(), mv$(args_arg), ret_type.clone(), mv$(dispatch_node) );
                            break;
                        case ::HIR::ExprNode_Closure::Class::Shared:
                            fcn = H::make_fn( mv$(params), mv$(trait_params), closure_type.clone(), mv$(args_arg), ret_type.clone(), mv$(dispatch_node) );
                            break;
                        default:
                            throw "";
                        }
                        return ::std::make_pair(c, mv$(fcn));
                    }
                };
                m_out.impls_closure.push_back( H2::make_dispatch(sp, ::HIR::ExprNode_Closure::Class::Once  , params.clone(), trait_params.clone(), closure_type, args_ty, ret_type) );
                m_out.impls_closure.push_back( H2::make_dispatch(sp, ::HIR::ExprNode_Closure::Class::Mut   , params.clone(), trait_params.clone(), closure_type, args_ty, ret_type) );
                m_out.impls_closure.push_back( H2::make_dispatch(sp, ::HIR::ExprNode_Closure::Class::Shared, params.clone(), mv$(trait_params)   , closure_type, args_ty, ret_type) );

                // 2. Split args_pat/args_ty into separate arguments
                ::std::vector<::std::pair< ::HIR::Pattern, ::HIR::TypeRef>> args_split;
                args_split.reserve( node.m_args.size() );
                for(size_t i = 0; i < node.m_args.size(); i ++)
                {
                    args_split.push_back(::std::make_pair(
                            mv$( args_pat.m_data.as_Tuple().sub_patterns[i] ),
                            mv$( args_ty.data().as_Tuple()[i] )
                            ));
                }
                // - Create fn_free free method
                m_out.impls_type.push_back(
                    box$( H::make_fnfree( mv$(params), mv$(closure_type), mv$(args_split), mv$(ret_type), std::move(body_code) ) )
                    );

                } break;
            case ::HIR::ExprNode_Closure::Class::Shared: {
                DEBUG("class=Shared");
                const auto& lang_Fn = m_resolve.m_crate.get_lang_item_path(node.span(), "fn");
                const auto method_self_ty = ::HIR::TypeRef::new_borrow( ::HIR::BorrowType::Shared, closure_type.clone() );

                // - FnOnce
                {
                    auto dispatch_node = NEWNODE(ret_type.clone(), CallPath, sp,
                        ::HIR::Path(closure_type.clone(), ::HIR::GenericPath(lang_Fn, trait_params.clone()), rcstring_call, HIR::PathParams(HIR::LifetimeRef())),
                        make_vec2(
                            NEWNODE(method_self_ty.clone(), Borrow, sp, ::HIR::BorrowType::Shared, NEWNODE(closure_type.clone(), Variable, sp, rcstring_self, 0)),
                            NEWNODE(args_ty.clone(), Variable, sp, rcstring_arg, 1)
                            )
                        );
                    dynamic_cast<::HIR::ExprNode_CallPath&>(*dispatch_node).m_cache.m_arg_types = make_vec3( method_self_ty.clone(), args_ty.clone(), ret_type.clone() );
                    auto args_arg = ::std::make_pair(
                        ::HIR::Pattern { {false, ::HIR::PatternBinding::Type::Move, rcstring_args, 1}, {} },
                        args_ty.clone()
                        );
                    m_out.impls_closure.push_back(::std::make_pair(
                        ::HIR::ExprNode_Closure::Class::Once,
                        H::make_fnonce( params.clone(), trait_params.clone(), closure_type.clone(), mv$(args_arg), ret_type.clone(), mv$(dispatch_node) )
                        ));
                }
                // - FnMut
                {
                    auto self_ty = ::HIR::TypeRef::new_borrow( ::HIR::BorrowType::Unique, closure_type.clone() );
                    auto dispatch_node = NEWNODE(ret_type.clone(), CallPath, sp,
                        ::HIR::Path(closure_type.clone(), ::HIR::GenericPath(lang_Fn, trait_params.clone()), rcstring_call, HIR::PathParams(HIR::LifetimeRef())),
                        make_vec2(
                            NEWNODE(method_self_ty.clone(), Borrow, sp, ::HIR::BorrowType::Shared, NEWNODE(closure_type.clone(), Deref, sp, NEWNODE(mv$(self_ty), Variable, sp, rcstring_self, 0))),
                            NEWNODE(args_ty.clone(), Variable, sp, rcstring_arg, 1)
                            )
                        );
                    dynamic_cast<::HIR::ExprNode_CallPath&>(*dispatch_node).m_cache.m_arg_types = make_vec3( method_self_ty.clone(), args_ty.clone(), ret_type.clone() );
                    auto args_arg = ::std::make_pair(
                        ::HIR::Pattern { {false, ::HIR::PatternBinding::Type::Move, rcstring_args, 1}, {} },
                        args_ty.clone()
                        );
                    m_out.impls_closure.push_back(::std::make_pair(
                        ::HIR::ExprNode_Closure::Class::Mut,
                        H::make_fnmut( params.clone(), trait_params.clone(), closure_type.clone(), mv$(args_arg), ret_type.clone(), mv$(dispatch_node) )
                        ));
                }

                // - Fn
                m_out.impls_closure.push_back(::std::make_pair(
                    ::HIR::ExprNode_Closure::Class::Shared,
                    H::make_fn( mv$(params), mv$(trait_params), mv$(closure_type), ::std::make_pair(mv$(args_pat), mv$(args_ty)), mv$(ret_type), mv$(body_code) )
                    ));
                } break;
            case ::HIR::ExprNode_Closure::Class::Mut: {
                DEBUG("class=Mut");
                const auto& lang_FnMut = m_resolve.m_crate.get_lang_item_path(node.span(), "fn_mut");
                const auto method_self_ty = ::HIR::TypeRef::new_borrow( ::HIR::BorrowType::Unique, closure_type.clone() );

                // - FnOnce
                {
                    auto dispatch_node = NEWNODE(ret_type.clone(), CallPath, sp,
                        ::HIR::Path(closure_type.clone(), ::HIR::GenericPath(lang_FnMut, trait_params.clone()), rcstring_call_mut, HIR::PathParams(HIR::LifetimeRef())),
                        make_vec2(
                            NEWNODE(method_self_ty.clone(), Borrow, sp, ::HIR::BorrowType::Unique, NEWNODE(closure_type.clone(), Variable, sp, rcstring_self, 0)),
                            NEWNODE(args_ty.clone(), Variable, sp, rcstring_arg, 1)
                            )
                        );
                    dynamic_cast<::HIR::ExprNode_CallPath&>(*dispatch_node).m_cache.m_arg_types = make_vec3( method_self_ty.clone(), args_ty.clone(), ret_type.clone() );
                    auto args_arg = ::std::make_pair(
                        ::HIR::Pattern { {false, ::HIR::PatternBinding::Type::Move, rcstring_args, 1}, {} },
                        args_ty.clone()
                        );
                    m_out.impls_closure.push_back(::std::make_pair(
                        ::HIR::ExprNode_Closure::Class::Once,
                        H::make_fnonce( params.clone(), trait_params.clone(), closure_type.clone(), mv$(args_arg), ret_type.clone(), mv$(dispatch_node) )
                        ));
                }

                // - FnMut (code)
                m_out.impls_closure.push_back(::std::make_pair(
                    ::HIR::ExprNode_Closure::Class::Mut,
                    H::make_fnmut( mv$(params), mv$(trait_params), mv$(closure_type), ::std::make_pair(mv$(args_pat), mv$(args_ty)), mv$(ret_type), mv$(body_code) )
                    ));
                } break;
            case ::HIR::ExprNode_Closure::Class::Once:
                DEBUG("class=Once");
                // - FnOnce (code)
                m_out.impls_closure.push_back(::std::make_pair(
                    ::HIR::ExprNode_Closure::Class::Once,
                    H::make_fnonce( mv$(params), mv$(trait_params), mv$(closure_type), ::std::make_pair(mv$(args_pat), mv$(args_ty)), mv$(ret_type), mv$(body_code) )
                    ));
                break;
            }

            for(auto& ti : m_out.impls_closure) {
                for(auto& m : ti.second.m_methods) {
                    if(!m.second.data.m_code.m_state) {
                        m.second.data.m_code.m_state = m_expr_ptr.m_state.clone();
                    }
                }
            }
            for(auto& ti : m_out.impls_type) {
                for(auto& m : ti->m_methods) {
                    if(!m.second.data.m_code.m_state) {
                        m.second.data.m_code.m_state = m_expr_ptr.m_state.clone();
                    }
                }
            }
        }


        // So, re-write all variable references into either a capture or a local.
        class ExprVisitor_GeneratorRewrite:
            public ::HIR::ExprVisitorDef
        {
            const Monomorph& m_monomorph;
            const std::map<unsigned, unsigned>&   m_variable_rewrites;

            ::HIR::ExprNodeP    m_replacement;
        public:
            ExprVisitor_GeneratorRewrite(const Monomorph& monomorph, const std::map<unsigned, unsigned>& rewrites)
                : m_monomorph(monomorph)
                , m_variable_rewrites(rewrites)
            {
            }

            void visit_type(::HIR::TypeRef& ty) override {
                ty = m_monomorph.monomorph_type(Span(), ty, /*allow_infer=*/true);
            }
            void visit_path_params(::HIR::PathParams& pp) override {
                pp = m_monomorph.monomorph_path_params(Span(), pp, /*allow_infer=*/true);
            }

            /// Support replacing nodes
            void visit_node_ptr(::HIR::ExprNodeP& node_ptr) override
            {
                ::HIR::ExprVisitorDef::visit_node_ptr(node_ptr);
                if( m_replacement ) {
                    node_ptr = std::move(m_replacement);
                }
            }

            /// Rewrite variable references into either a different slot or a field access
            void visit(::HIR::ExprNode_Variable& node) override
            {
                node.m_slot = m_variable_rewrites.at(node.m_slot);
            }
            void visit(HIR::ExprNode_ConstParam& node) override {
                node.m_binding = m_monomorph.get_value(node.span(), HIR::GenericRef("", node.m_binding)).as_Generic().binding;
            }

            // Custom visitor that only updates the captures and path
            // - Don't want to visit the patterns within
            void visit(::HIR::ExprNode_Closure& node) override
            {
                assert(!node.m_code);
                visit_generic_path(::HIR::Visitor::PathContext::TYPE, node.m_obj_path);

                for(auto& cap : node.m_captures)
                    visit_node_ptr(cap);
            }

            /// Update variable definitions
            void visit_pattern(const Span& sp, ::HIR::Pattern& pat) override
            {
                ::HIR::ExprVisitorDef::visit_pattern(sp, pat);
                for(auto& pb : pat.m_bindings)
                {
                    visit_pattern_binding(sp, pb);
                }
                if(auto* pe = pat.m_data.opt_SplitSlice())
                {
                    visit_pattern_binding(sp, pe->extra_bind);
                }
            }
            void visit_pattern_binding(const Span& sp, ::HIR::PatternBinding& binding)
            {
                if(binding.is_valid())
                {
                    ASSERT_BUG(sp, m_variable_rewrites.count(binding.m_slot), "Newly defined variable #" << binding.m_slot << " not in rewrite list?");
                    binding.m_slot = m_variable_rewrites.at(binding.m_slot);
                }
            }
        };

        struct CrVars {
            ::std::map<unsigned, unsigned> variable_rewrites;
            ::std::vector<HIR::ValueUsage> capture_usages;
            ::std::vector<HIR::TypeRef>   new_locals;
            // NOTE: The first entry in this is the state, but that isn't know yet - so is just `MaybeUninit<_>`
            ::std::vector< ::HIR::VisEnt< ::HIR::TypeRef> > struct_ents;
            ::std::vector<HIR::ExprNodeP>   capture_nodes;

            void set_state_type(HIR::TypeRef ty) {
                this->struct_ents.at(0).ent.data_mut().as_Path().path.m_data.as_Generic().m_params.m_types.at(0) = std::move(ty);
            }
        };
        CrVars coroutine_vars(const Span& sp, const ::HIR::ExprNode_Generator::AvuCache& avu_cache, unsigned n_args, const Monomorph& monomorph_cb) const
        {
            CrVars  rv;
            // 3. Classify varibles
            // - Captures: defined outside and need to be captured using closure capture rules (`defined_stack.empty()`)
            // - Saved: defined inside but used across a yield boundary (see GeneratorState)
            // - Local: defined and used between two yields
            size_t n_caps = avu_cache.captured_vars.size();
            size_t n_locals = avu_cache.local_vars.size();
            rv.capture_usages.reserve(n_caps);
            rv.new_locals.reserve(1 + n_caps + n_locals);
            rv.struct_ents.reserve(1 + n_caps);
            rv.capture_nodes.reserve(n_caps);
            // First new local is always the invocation `self`
            for(unsigned i = 0; i < n_args; i ++) {
                rv.new_locals.push_back(HIR::TypeRef());  // `self: &mut NewStruct`
            }
            // First ent is the runtime state (first is zeroed, the second is set to uninit)

            const auto& lang_MaybeUninit = m_resolve.m_crate.get_lang_item_path(sp, "maybe_uninit");
            const auto& unm_MaybeUninit = m_resolve.m_crate.get_union_by_path(sp, lang_MaybeUninit);
            // Wrap the state in MaybeUninit to prevent any attempt at using niche optimisations
            rv.struct_ents.push_back(HIR::VisEnt<HIR::TypeRef> {
                HIR::Publicity::new_none(),
                ::HIR::TypeRef::new_path( ::HIR::GenericPath(lang_MaybeUninit, ::HIR::PathParams(::HIR::TypeRef())), &unm_MaybeUninit )
            });

            // Add captures to the locals list first
            for(const auto& cap : avu_cache.captured_vars)
            {
                unsigned index = rv.new_locals.size();
                rv.variable_rewrites.insert(std::make_pair( cap.first, index ));
                rv.new_locals.push_back( monomorph_cb.monomorph_type(sp, m_variable_types.at(cap.first)) );

                rv.capture_usages.push_back(cap.second);
                auto cap_ty = monomorph_cb.monomorph_type(sp, m_variable_types.at(cap.first));
                rv.struct_ents.push_back(HIR::VisEnt<HIR::TypeRef> { HIR::Publicity::new_none(), cap_ty.clone() });
                rv.capture_nodes.push_back(HIR::ExprNodeP(new ::HIR::ExprNode_Variable(sp, "", cap.first)));
                switch(cap.second)
                {
                case ::HIR::ValueUsage::Unknown:
                    BUG(sp, "Unexpected ValueUsage::Unknown on #" << cap.first);
                case ::HIR::ValueUsage::Move: {
                    // No wrapping needed (drop handled by custom drop glue)
                    } break;
                case ::HIR::ValueUsage::Borrow:
                    rv.capture_nodes.back()->m_res_type = cap_ty.clone();
                    cap_ty = ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Shared, std::move(cap_ty));
                    rv.struct_ents.back().ent = ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Shared, std::move(rv.struct_ents.back().ent));
                    rv.capture_nodes.back() = HIR::ExprNodeP(new ::HIR::ExprNode_Borrow(sp, ::HIR::BorrowType::Shared, std::move(rv.capture_nodes.back())));
                    break;
                case ::HIR::ValueUsage::Mutate:
                    rv.capture_nodes.back()->m_res_type = cap_ty.clone();
                    cap_ty = ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Unique, std::move(cap_ty));
                    rv.struct_ents.back().ent = ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Unique, std::move(rv.struct_ents.back().ent));
                    rv.capture_nodes.back() = HIR::ExprNodeP(new ::HIR::ExprNode_Borrow(sp, ::HIR::BorrowType::Unique, std::move(rv.capture_nodes.back())));
                    break;
                }
                rv.capture_nodes.back()->m_res_type = mv$(cap_ty);
            }
            for(const auto& slot : avu_cache.local_vars)
            {
                unsigned index = rv.new_locals.size();
                rv.variable_rewrites.insert(std::make_pair( slot, index ));
                rv.new_locals.push_back( monomorph_cb.monomorph_type(sp, m_variable_types.at(slot)) );
            }
            return rv;
        }

        /// <summary>
        /// Main extraction generator visitor
        /// </summary>
        void visit(::HIR::ExprNode_Generator& node) override
        {
            const auto& sp = node.span();

            // NOTE: Most of generator's lowering is done in MIR lowering
            // - This is because it needs to rewrite the flow quite severely.
            // > HOWEVER: The code is extracted here and passed over to the new impl
            // Update the type params in the state type path, now that everything has been visited (and thus all parameters are known)
            

            TRACE_FUNCTION_F("Extract generator - " << node.m_res_type);

            // 1. Recurse to obtain useful metadata
            ::HIR::ExprVisitorDef::visit(node);

            // -- Prepare type params for rewriting the expression tree
            ::HIR::GenericParams params;
            ::HIR::PathParams constructor_path_params;
            auto monomorph_cb = create_params(sp, m_resolve, params, constructor_path_params);

            // Generate the structure, 
            auto cr_vars = coroutine_vars(node.span(), node.m_avu_cache, 1 + (TARGETVER_LEAST_1_74 ? 1 : 0), monomorph_cb);

            {
                TRACE_FUNCTION_F("-- Rewrite variables");
                ExprVisitor_GeneratorRewrite visitor_rewrite(monomorph_cb, cr_vars.variable_rewrites);
                visitor_rewrite.visit_node_ptr(node.m_code);
            }

            monomorph_cb.add_bounds(sp, m_resolve);

            // Create state index enum
            auto state_idx_type = m_out.new_type("gen_state_idx#", m_new_type_suffix, ::HIR::Enum {
                ::HIR::GenericParams(),
                false,
                ::HIR::Enum::Repr(),
                ::HIR::Enum::Class::make_Value({})
                });
            auto state_idx_ty = ::HIR::TypeRef::new_path( state_idx_type.first, &state_idx_type.second->as_Enum() );

            // Create the captures structure here, and update it afterwards with the state
            // - The final entry in captures is the state, and is pre-filled with zeroes by the creator's MIR lower
            auto state_str = ::HIR::Struct {
                params.clone(),
                ::HIR::Struct::Repr::Rust,
                ::HIR::Struct::Data::make_Tuple({}) // Will be filled in the MIR pass
            };
            state_str.m_data.as_Tuple().push_back(HIR::VisEnt<HIR::TypeRef> { HIR::Publicity::new_none(), state_idx_ty.clone() });
            ::HIR::SimplePath   state_struct_path;
            const ::HIR::TypeItem* state_struct_ptr;
            ::std::tie(state_struct_path, state_struct_ptr) = m_out.new_type("gen_state#", m_new_type_suffix, std::move(state_str));
            auto state_type = ::HIR::TypeRef::new_path( ::HIR::GenericPath(state_struct_path, params.make_nop_params(0)), &state_struct_ptr->as_Struct() );
            DEBUG("state_type = " << state_type);
            cr_vars.set_state_type(state_type.clone());

            auto gen_str = ::HIR::Struct {
                params.clone(),
                ::HIR::Struct::Repr::Rust,
                ::HIR::Struct::Data::make_Tuple(mv$(cr_vars.struct_ents))
            };
            gen_str.m_markings.has_drop_impl = true;
            ::HIR::SimplePath   gen_struct_path;
            const ::HIR::TypeItem* gen_struct_ptr;
            ::std::tie(gen_struct_path, gen_struct_ptr) = m_out.new_type(GENERATOR_PATH_PREFIX, m_new_type_suffix, mv$(gen_str));
            const auto& gen_struct_ref = gen_struct_ptr->as_Struct();
            DEBUG(gen_struct_path << " -> args=" << params.fmt_args() << " where " << params.fmt_bounds());

            // Mark the object pathname in the closure.
            node.m_obj_ptr = &gen_struct_ref;
            node.m_obj_path = ::HIR::GenericPath( gen_struct_path, monomorph_cb.freeze() );
            node.m_captures = std::move(cr_vars.capture_nodes);
            node.m_state_data_type = ::HIR::TypeRef::new_path( ::HIR::GenericPath(state_struct_path, node.m_obj_path.m_params.clone()), &state_struct_ptr->as_Struct() );

            auto lang_Pin = m_resolve.m_crate.get_lang_item_path(sp, "pin");
            // Return wrapper: Renamed in 1.90
            auto lang_GeneratorState = m_resolve.m_crate.get_lang_item_path(sp, TARGETVER_LEAST_1_90 ? "coroutine_state" : "generator_state");

            ::HIR::TypeRef& self_arg_ty = cr_vars.new_locals[0];
            // `::path::to::struct`
            self_arg_ty = ::HIR::TypeRef::new_path( ::HIR::GenericPath(gen_struct_path, params.make_nop_params(0)), &gen_struct_ref );
            // `&mut Self`
            self_arg_ty = ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Unique, std::move(self_arg_ty));
            if( TARGETVER_LEAST_1_74 ) {
                cr_vars.new_locals[1] = node.m_resume_ty.clone();
            }
            // `Pin<&mut Self>`
            self_arg_ty = ::HIR::TypeRef::new_path( ::HIR::GenericPath(lang_Pin, ::HIR::PathParams(std::move(self_arg_ty))), &m_resolve.m_crate.get_struct_by_path(sp, lang_Pin) );

            auto body_node = std::move(node.m_code);
            {
                DEBUG("-- Fixing types in body code");
                ExprVisitor_Fixup   fixup { m_resolve.m_crate, &params, monomorph_cb, &m_out };
                fixup.visit_node_ptr( body_node );
            }

            // -- Prepare drop impl for later filling
            ::HIR::Function* fcn_drop_ptr; {
                ::HIR::Function fcn_drop;
                fcn_drop.m_receiver = HIR::Function::Receiver::BorrowUnique;
                auto drop_self_arg_ty = ::HIR::TypeRef::new_path( ::HIR::GenericPath(gen_struct_path, params.make_nop_params(0)), &gen_struct_ref );
                drop_self_arg_ty = ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Unique, std::move(drop_self_arg_ty));
                fcn_drop.m_args.push_back(std::make_pair( HIR::Pattern(), mv$(drop_self_arg_ty) ));
                fcn_drop.m_return = ::HIR::TypeRef::new_unit();
                fcn_drop.m_code.reset( new ::HIR::ExprNode_Tuple(sp, {}) );
                fcn_drop.m_code->m_res_type = ::HIR::TypeRef::new_unit();
                fcn_drop.m_code.m_state = m_expr_ptr.m_state.clone();
                ::HIR::TraitImpl    drop_impl;
                drop_impl.m_params = params.clone();
                drop_impl.m_type = ::HIR::TypeRef::new_path( ::HIR::GenericPath(gen_struct_path, params.make_nop_params(0)), &gen_struct_ref );
                drop_impl.m_methods.insert(std::make_pair( RcString::new_interned("drop"), ::HIR::TraitImpl::ImplEnt<HIR::Function> { false, std::move(fcn_drop) } ));
                fcn_drop_ptr = &drop_impl.m_methods.at("drop").data;
                m_out.trait_impls.push_back(std::make_pair("drop", std::move(drop_impl)));
            }

            // -- Create function
            ::HIR::Function fcn_resume;
            // - `self: Pin<&mut {Self}>`
            fcn_resume.m_args.push_back(std::make_pair( HIR::Pattern(), self_arg_ty.clone() ));
            if( TARGETVER_LEAST_1_74 ) {
                fcn_resume.m_args.push_back(std::make_pair( HIR::Pattern(), monomorph_cb.monomorph_type(sp, node.m_resume_ty) ));
            }
            // - `-> GeneratorState<{Yield},{Return}>`
            ::HIR::PathParams   ret_params;
            ret_params.m_types.push_back( monomorph_cb.monomorph_type(sp, node.m_yield_ty) );
            ret_params.m_types.push_back( monomorph_cb.monomorph_type(sp, node.m_return) );
            fcn_resume.m_return = ::HIR::TypeRef::new_path( ::HIR::GenericPath(lang_GeneratorState, std::move(ret_params)), &m_resolve.m_crate.get_enum_by_path(sp, lang_GeneratorState) );
            // - ` { ... }`
            // Emit as a top-level generator
            // - It has a populated body, non-zero `m_obj_ptr`, and unset `m_obj_path`
            auto v = ::std::make_unique<::HIR::ExprNode_GeneratorWrapper>(sp, HIR::TypeRef(), mv$(body_node), /*move*/false, /*pinned*/false, /*future*/false);
            v->m_yield_ty = monomorph_cb.monomorph_type(sp, node.m_yield_ty);
            v->m_return   = monomorph_cb.monomorph_type(sp, node.m_return);
            v->m_capture_usages = std::move(cr_vars.capture_usages);
            v->m_res_type = fcn_resume.m_return.clone();
            v->m_obj_ptr = node.m_obj_ptr;
            v->m_state_data_type = mv$(state_type);
            v->m_state_idx_enum = mv$(state_idx_type.first);
            v->m_drop_fcn_ptr = fcn_drop_ptr;
            body_node.reset(v.release());
            fcn_resume.m_code.reset( body_node.release() );
            fcn_resume.m_code.m_state = m_expr_ptr.m_state.clone();
            fcn_resume.m_code.m_bindings = std::move(cr_vars.new_locals);


            // -- Create impl
            ::HIR::TraitImpl    impl;
            if( TARGETVER_LEAST_1_74 )
            {
                impl.m_trait_args.m_types.push_back( monomorph_cb.monomorph_type(sp, node.m_resume_ty) );
            }
            impl.m_type = ::HIR::TypeRef::new_path( ::HIR::GenericPath(gen_struct_path, params.make_nop_params(0)), &gen_struct_ref );
            impl.m_types.insert(std::make_pair( RcString::new_interned("Yield" ), ::HIR::TraitImpl::ImplEnt<HIR::TypeRef> { false, monomorph_cb.monomorph_type(sp, node.m_yield_ty) } ));
            impl.m_types.insert(std::make_pair( RcString::new_interned("Return"), ::HIR::TraitImpl::ImplEnt<HIR::TypeRef> { false, monomorph_cb.monomorph_type(sp, node.m_return) } ));
            impl.m_methods.insert(std::make_pair( RcString::new_interned("resume"), ::HIR::TraitImpl::ImplEnt<HIR::Function> { false, std::move(fcn_resume) } ));
            impl.m_params = std::move(params);
            m_out.trait_impls.push_back(std::make_pair(TARGETVER_LEAST_1_90 ? "coroutine" : "generator", std::move(impl)));
        }

        void visit(::HIR::ExprNode_AsyncBlock& node) override
        {
            const auto& sp = node.span();

            TRACE_FUNCTION_F("Extract async - " << node.m_res_type);

            // 1. Recurse to obtain useful metadata
            ::HIR::ExprVisitorDef::visit(node);

            // -- Prepare type params for rewriting the expression tree
            ::HIR::GenericParams params;
            ::HIR::PathParams constructor_path_params;
            auto monomorph_cb = create_params(sp, m_resolve, params, constructor_path_params);

            auto cr_vars = coroutine_vars(node.span(), node.m_avu_cache, 2, monomorph_cb);

            {
                ExprVisitor_GeneratorRewrite visitor_rewrite(monomorph_cb, cr_vars.variable_rewrites);
                visitor_rewrite.visit_node_ptr(node.m_code);
            }

            monomorph_cb.add_bounds(sp, m_resolve);

            // Create state index enum
            auto state_idx_type = m_out.new_type("async_state_idx#", m_new_type_suffix, ::HIR::Enum {
                ::HIR::GenericParams(),
                false,
                ::HIR::Enum::Repr(),
                ::HIR::Enum::Class::make_Value({})
                });
            auto state_idx_ty = ::HIR::TypeRef::new_path( state_idx_type.first, &state_idx_type.second->as_Enum() );

            // Create the captures structure here, and update it afterwards with the state
            // - The final entry in captures is the state, and is pre-filled with zeroes by the creator's MIR lower
            auto state_str = ::HIR::Struct {
                params.clone(),
                ::HIR::Struct::Repr::Rust,
                ::HIR::Struct::Data::make_Tuple({}) // Will be filled in the MIR pass
            };
            state_str.m_data.as_Tuple().push_back(HIR::VisEnt<HIR::TypeRef> { HIR::Publicity::new_none(), state_idx_ty.clone() });
            ::HIR::SimplePath   state_struct_path;
            const ::HIR::TypeItem* state_struct_ptr;
            ::std::tie(state_struct_path, state_struct_ptr) = m_out.new_type("async_state#", m_new_type_suffix, std::move(state_str));
            auto state_type = ::HIR::TypeRef::new_path( ::HIR::GenericPath(state_struct_path, params.make_nop_params(0)), &state_struct_ptr->as_Struct() );

            // Update the state type entry, now that it's known
            cr_vars.set_state_type(state_type.clone());

            // NOTE: Most of async lowering is done in MIR lowering
            // - This is because it needs to rewrite the flow quite severely.
            // > HOWEVER: The code is extracted here and passed over to the new impl

            auto gen_str = ::HIR::Struct {
                params.clone(),
                ::HIR::Struct::Repr::Rust,
                ::HIR::Struct::Data::make_Tuple(std::move(cr_vars.struct_ents))
            };
            gen_str.m_markings.has_drop_impl = true;
            ::HIR::SimplePath   gen_struct_path;
            const ::HIR::TypeItem* gen_struct_ptr;
            ::std::tie(gen_struct_path, gen_struct_ptr) = m_out.new_type(PATH_PREFIX_FUTURE, m_new_type_suffix, mv$(gen_str));
            const auto& gen_struct_ref = gen_struct_ptr->as_Struct();

            DEBUG(gen_struct_path << " -> args=" << params.fmt_args() << " where " << params.fmt_bounds());

            // Mark the object pathname
            node.m_obj_ptr = &gen_struct_ref;
            node.m_obj_path = ::HIR::GenericPath( gen_struct_path, monomorph_cb.freeze() );
            node.m_captures = std::move(cr_vars.capture_nodes);
            node.m_state_data_type = ::HIR::TypeRef::new_path( ::HIR::GenericPath(state_struct_path, node.m_obj_path.m_params.clone()), &state_struct_ptr->as_Struct() );

            ::HIR::TypeRef& self_arg_ty = cr_vars.new_locals[0];
            // `::path::to::struct`
            self_arg_ty = ::HIR::TypeRef::new_path( ::HIR::GenericPath(gen_struct_path, params.make_nop_params(0)), &gen_struct_ref );
            // `&mut Self`
            self_arg_ty = ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Unique, std::move(self_arg_ty));
            auto lang_Pin = m_resolve.m_crate.get_lang_item_path(sp, "pin");
            // `Pin<&mut Self>`
            self_arg_ty = ::HIR::TypeRef::new_path( ::HIR::GenericPath(lang_Pin, ::HIR::PathParams(std::move(self_arg_ty))), &m_resolve.m_crate.get_struct_by_path(sp, lang_Pin) );

            // `context: &mut Context`
            auto lang_Context = m_resolve.m_crate.get_lang_item_path(sp, "Context");
            cr_vars.new_locals[1] = ::HIR::TypeRef::new_borrow(
                ::HIR::BorrowType::Unique,
                ::HIR::TypeRef::new_path( ::HIR::GenericPath(lang_Context, ::HIR::PathParams(::HIR::LifetimeRef())), &m_resolve.m_crate.get_struct_by_path(sp, lang_Context) )
            );

            auto return_ty = node.m_code->m_res_type.clone();
            auto body_node = std::move(node.m_code);
            {
                DEBUG("-- Fixing types in body code");
                ExprVisitor_Fixup   fixup { m_resolve.m_crate, &params, monomorph_cb, &m_out };
                fixup.visit_node_ptr( body_node );
            }

            // -- Prepare drop impl for later filling
            ::HIR::Function* fcn_drop_ptr; {
                ::HIR::Function fcn_drop;
                fcn_drop.m_receiver = HIR::Function::Receiver::BorrowUnique;
                auto drop_self_arg_ty = ::HIR::TypeRef::new_path( ::HIR::GenericPath(gen_struct_path, params.make_nop_params(0)), &gen_struct_ref );
                drop_self_arg_ty = ::HIR::TypeRef::new_borrow(::HIR::BorrowType::Unique, std::move(drop_self_arg_ty));
                fcn_drop.m_args.push_back(std::make_pair( HIR::Pattern(), mv$(drop_self_arg_ty) ));
                fcn_drop.m_return = ::HIR::TypeRef::new_unit();
                fcn_drop.m_code.reset( new ::HIR::ExprNode_Tuple(sp, {}) );
                fcn_drop.m_code->m_res_type = ::HIR::TypeRef::new_unit();
                fcn_drop.m_code.m_state = m_expr_ptr.m_state.clone();
                ::HIR::TraitImpl    drop_impl;
                drop_impl.m_params = params.clone();
                drop_impl.m_type = ::HIR::TypeRef::new_path( ::HIR::GenericPath(gen_struct_path, params.make_nop_params(0)), &gen_struct_ref );
                drop_impl.m_methods.insert(std::make_pair( RcString::new_interned("drop"), ::HIR::TraitImpl::ImplEnt<HIR::Function> { false, std::move(fcn_drop) } ));
                fcn_drop_ptr = &drop_impl.m_methods.at("drop").data;
                m_out.trait_impls.push_back(std::make_pair("drop", std::move(drop_impl)));
            }

            // -- Create function
            ::HIR::Function fcn_resume;
            // - `self: Pin<&mut {Self}>`
            fcn_resume.m_args.push_back(std::make_pair( HIR::Pattern(), self_arg_ty.clone() ));
            // - `context: &mut Context<'_>`
            fcn_resume.m_args.push_back(std::make_pair( HIR::Pattern(), cr_vars.new_locals[1].clone() ));
            // - `-> Poll<{Return}>`
            ::HIR::PathParams   ret_params;
            ret_params.m_types.push_back( monomorph_cb.monomorph_type(sp, return_ty) );
            auto lang_Poll = m_resolve.m_crate.get_lang_item_path(sp, "Poll");
            fcn_resume.m_return = ::HIR::TypeRef::new_path( ::HIR::GenericPath(lang_Poll, std::move(ret_params)), &m_resolve.m_crate.get_enum_by_path(sp, lang_Poll) );
            // - ` { ... }`
            // Emit as a top-level generator
            // - It has a populated body, non-zero `m_obj_ptr`, and unset `m_obj_path`
            auto v = ::std::make_unique<::HIR::ExprNode_GeneratorWrapper>(sp, HIR::TypeRef(), std::move(body_node), false, false, /*future*/true);
            v->m_return   = monomorph_cb.monomorph_type(sp, return_ty);
            v->m_capture_usages = std::move(cr_vars.capture_usages);
            v->m_res_type = fcn_resume.m_return.clone();
            v->m_obj_ptr = node.m_obj_ptr;
            v->m_state_data_type = mv$(state_type);
            v->m_state_idx_enum = mv$(state_idx_type.first);
            v->m_drop_fcn_ptr = fcn_drop_ptr;
            fcn_resume.m_code.reset( v.release() );
            fcn_resume.m_code.m_state = m_expr_ptr.m_state.clone();
            fcn_resume.m_code.m_bindings = std::move(cr_vars.new_locals);


            // -- Create impl
            ::HIR::TraitImpl    impl;
            impl.m_params = std::move(params);
            impl.m_type = ::HIR::TypeRef::new_path( ::HIR::GenericPath(gen_struct_path, impl.m_params.make_nop_params(0)), &gen_struct_ref );
            impl.m_types.insert(std::make_pair( RcString::new_interned("Output"), ::HIR::TraitImpl::ImplEnt<HIR::TypeRef> { false, monomorph_cb.monomorph_type(sp, return_ty) } ));
            impl.m_methods.insert(std::make_pair( RcString::new_interned("poll"), ::HIR::TraitImpl::ImplEnt<HIR::Function> { false, std::move(fcn_resume) } ));
            m_out.trait_impls.push_back(std::make_pair("future_trait", std::move(impl)));
        }

        /// Newly defined variables
        void visit_pattern(const Span& sp, ::HIR::Pattern& pat) override
        {
        }

        // Loops that contain yeild points require all referenced variables to be saved
        void visit(::HIR::ExprNode_Loop& node) override
        {
            ::HIR::ExprVisitorDef::visit(node);
        }
        void visit(::HIR::ExprNode_Yield& node) override
        {
            ::HIR::ExprVisitorDef::visit(node);
        }

    private:
    };

    /// <summary>
    /// Top-level visitor
    /// </summary>
    class OuterVisitor:
        public ::HIR::Visitor
    {
        StaticTraitResolve  m_resolve;
        OutState    m_out;

        const ::HIR::SimplePath*  m_cur_mod_path;
        const ::HIR::TypeRef*   m_self_type = nullptr;
    public:
        OuterVisitor(const ::HIR::Crate& crate):
            m_resolve(crate),
            m_cur_mod_path( nullptr )
        {}

        void visit_crate(::HIR::Crate& crate) override
        {
            Span    sp;

            unsigned int closure_count = 0;
            ::HIR::SimplePath   root_mod_path(crate.m_crate_name,{});
            m_cur_mod_path = &root_mod_path;
            // Type construction helper used for impl blocks
            m_out.new_type = [&](const char* prefix, const char* suffix, auto s)->auto {
                auto name = RcString::new_interned(FMT(prefix << "I_" << suffix << (suffix[0] ? "_" : "") << closure_count));
                closure_count += 1;
                auto boxed = box$(( ::HIR::VisEnt< ::HIR::TypeItem> { ::HIR::Publicity::new_none(), mv$(s) } ));
                auto* ret_ptr = &boxed->ent;
                crate.m_root_module.m_mod_items.insert( ::std::make_pair(name, mv$(boxed)) );
                return ::std::make_pair( ::HIR::SimplePath(crate.m_crate_name, {}) + name, ret_ptr );
                };

            auto empty_counts = m_out.save_counts();

            ::HIR::Visitor::visit_crate(crate);

            // Defensive measure
            m_out.update_source_module(empty_counts, root_mod_path);

            m_out.push_new_impls(sp, crate);
        }

        void visit_module(::HIR::ItemPath p, ::HIR::Module& mod) override
        {
            auto saved = m_cur_mod_path;
            auto path = p.get_simple_path();
            m_cur_mod_path = &path;

            ::std::vector< ::std::pair<RcString, std::unique_ptr< ::HIR::VisEnt< ::HIR::TypeItem> > >>  new_types;

            auto prev_impls = m_out.save_counts();

            unsigned int closure_count = 0;
            auto saved_nt = mv$(m_out.new_type);
            m_out.new_type = [&](const char* prefix, const char* suffix, auto s)->auto {
                // TODO: Use a function on `mod` that adds a closure and makes the indexes be per suffix
                auto name = RcString::new_interned( FMT(prefix << suffix << (suffix[0] ? "_" : "") << closure_count) );
                closure_count += 1;
                auto boxed = box$( (::HIR::VisEnt< ::HIR::TypeItem> { ::HIR::Publicity::new_none(),  mv$(s) }) );
                auto* ret_ptr = &boxed->ent; 
                new_types.push_back( ::std::make_pair(name, mv$(boxed)) );
                return ::std::make_pair( (p + name).get_simple_path(), ret_ptr );
                };

            ::HIR::Visitor::visit_module(p, mod);

            m_cur_mod_path = saved;
            m_out.new_type = mv$(saved_nt);

            for(auto& e : new_types)
            {
                DEBUG(p << ": Push " << e.first);
                mod.m_mod_items.insert( mv$(e) );
            }
            // Fix module paths on all impls created during this call that haven't already had a path set
            // - Child modules will set paths on theirs
            // - The start counts are needed to avoid setting impls from sibling items
            m_out.update_source_module(prev_impls, path);
        }

        // NOTE: This is left here to ensure that any expressions that aren't handled by higher code cause a failure
        void visit_expr(::HIR::ExprPtr& exp) override {
            BUG(Span(), "visit_expr hit in OuterVisitor");
        }

        void visit_type(::HIR::TypeRef& ty) override
        {
            if(auto* e = ty.data_mut().opt_Array())
            {
                this->visit_type( e->inner );
                DEBUG("Array size " << ty);
                if( e->size.is_Unevaluated() ) {
                    //::std::vector< ::HIR::TypeRef>  tmp;
                    //ExprVisitor_Extract    ev(m_resolve, tmp, m_new_trait_impls);
                    //ev.visit_root( *e.size );
                }
            }
            else {
                ::HIR::Visitor::visit_type(ty);
            }
        }

        // ------
        // Code-containing items
        // ------
        void visit_function(::HIR::ItemPath p, ::HIR::Function& item) override {
            auto _ = this->m_resolve.set_item_generics(item.m_params);
            if( item.m_code )
            {
                assert( m_cur_mod_path );
                DEBUG("Function code " << p);

                {
                    ExprVisitor_Extract    ev(m_resolve, m_self_type, item.m_code.m_bindings, item.m_code, m_out, p.name);
                    ev.visit_root( *item.m_code );
                }

                {
                    MonomorphiserNop    mm;
                    ExprVisitor_Fixup   fixup { m_resolve.m_crate, nullptr, mm, &m_out };
                    fixup.visit_root( item.m_code );
                }
            }
            else
            {
                DEBUG("Function code " << p << " (none)");
            }
        }
        void visit_static(::HIR::ItemPath p, ::HIR::Static& item) override {
            if( item.m_value )
            {
                auto _ = this->m_resolve.set_item_generics(item.m_params);
                ExprVisitor_Extract    ev(m_resolve, m_self_type, item.m_value.m_bindings, item.m_value, m_out, p.name);
                ev.visit_root(*item.m_value);

                {
                    MonomorphiserNop    mm;
                    ExprVisitor_Fixup   fixup { m_resolve.m_crate, nullptr, mm, &m_out };
                    fixup.visit_root( item.m_value );
                    fixup.visit_type( item.m_type );
                }
            }
        }
        void visit_constant(::HIR::ItemPath p, ::HIR::Constant& item) override {
            if( item.m_value )
            {
                //::std::vector< ::HIR::TypeRef>  tmp;
                //ExprVisitor_Extract    ev(m_resolve, m_self_type, tmp, m_new_trait_impls);
                //ev.visit_root(*item.m_value);
            }
        }
        void visit_enum(::HIR::ItemPath p, ::HIR::Enum& item) override {
            //auto _ = this->m_ms.set_item_generics(item.m_params);

            /*
            if(const auto* e = item.m_data.opt_Value())
            {
                auto enum_type = ::HIR::TypeRef(::HIR::CoreType::Isize);
                for(auto& var : e->variants)
                {
                    DEBUG("Enum value " << p << " - " << var.name);
                    ::std::vector< ::HIR::TypeRef>  tmp;
                    ExprVisitor_Extract    ev(m_resolve, tmp, m_new_trait_impls);
                    ev.visit_root(var.expr);
                }
            }
            */
        }

        void visit_trait(::HIR::ItemPath p, ::HIR::Trait& item) override
        {
            auto _ = this->m_resolve.set_impl_generics(MetadataType::TraitObject, item.m_params);
            ::HIR::TypeRef  self(rcstring_Self, 0xFFFF);
            m_self_type = &self;
            ::HIR::Visitor::visit_trait(p, item);
            m_self_type = nullptr;
        }


        void visit_type_impl(::HIR::TypeImpl& impl) override
        {
            TRACE_FUNCTION_F("impl " << impl.m_type);
            m_self_type = &impl.m_type;
            auto _ = this->m_resolve.set_impl_generics(impl.m_type, impl.m_params);

            // TODO: Re-create m_new_type to store in the source module

            auto prev_impls = m_out.save_counts();

            ::HIR::Visitor::visit_type_impl(impl);

            m_out.update_source_module(prev_impls, impl.m_src_module);

            m_self_type = nullptr;
        }
        void visit_trait_impl(const ::HIR::SimplePath& trait_path, ::HIR::TraitImpl& impl) override
        {
            TRACE_FUNCTION_F("impl " << trait_path << " for " << impl.m_type);
            m_self_type = &impl.m_type;
            auto _ = this->m_resolve.set_impl_generics(impl.m_type, impl.m_params);

            auto prev_impls = m_out.save_counts();

            ::HIR::Visitor::visit_trait_impl(trait_path, impl);

            m_out.update_source_module(prev_impls, impl.m_src_module);

            m_self_type = nullptr;
        }
    };
}

void HIR_Expand_Closures_Expr(const ::HIR::Crate& crate_ro, ::HIR::TypeRef& exp_ty, ::HIR::ExprPtr& exp)
{
    Span    sp;
    auto& crate = const_cast<::HIR::Crate&>(crate_ro);
    TRACE_FUNCTION;

    StaticTraitResolve   resolve { crate };
    assert(exp);
    resolve.set_both_generics_raw(exp.m_state->m_impl_generics, exp.m_state->m_item_generics);

    const ::HIR::TypeRef*   self_type = nullptr;  // TODO: Need to be able to get this?

    static int closure_count = 0;
    OutState    out;
    out.new_type = [&](const char* prefix, const char* suffix, auto s)->auto {
        auto name = RcString::new_interned(FMT(prefix << "C_" << closure_count));
        closure_count += 1;
        auto boxed = box$(( ::HIR::VisEnt< ::HIR::TypeItem> { ::HIR::Publicity::new_none(), ::HIR::TypeItem( mv$(s) ) } ));
        auto* ret_ptr = &boxed->ent;
        crate.m_new_types.push_back( ::std::make_pair(name, mv$(boxed)) );
        return ::std::make_pair( ::HIR::SimplePath(crate.m_crate_name, {}) + name, ret_ptr );
        };

    {
        ExprVisitor_Extract    ev(resolve, self_type, exp.m_bindings, exp, out, "");
        ev.visit_root( *exp );
    }

    {
        MonomorphiserNop    mm;
        ExprVisitor_Fixup   fixup { crate, nullptr, mm, &out };
        fixup.visit_root( exp );
        fixup.visit_type(exp_ty);
    }

    for(auto& impl : out.impls_type)
    {
        for( auto& m : impl->m_methods )
        {
            m.second.data.m_code.m_state = ::HIR::ExprStatePtr(*exp.m_state);
            m.second.data.m_code.m_state->stage = ::HIR::ExprState::Stage::Typecheck;
        }
        impl->m_src_module = exp.m_state->m_mod_path;
    }
    for(auto& impl : out.impls_closure)
    {
        for( auto& m : impl.second.m_methods )
        {
            m.second.data.m_code.m_state = ::HIR::ExprStatePtr(*exp.m_state);
            m.second.data.m_code.m_state->stage = ::HIR::ExprState::Stage::Typecheck;
        }
        impl.second.m_src_module = exp.m_state->m_mod_path;
    }
    for(auto& impl : out.trait_impls)
    {
        for( auto& m : impl.second.m_methods )
        {
            m.second.data.m_code.m_state = ::HIR::ExprStatePtr(*exp.m_state);
            m.second.data.m_code.m_state->stage = ::HIR::ExprState::Stage::Typecheck;
        }
        impl.second.m_src_module = exp.m_state->m_mod_path;
    }
    out.push_new_impls(sp, crate);
}

void HIR_Expand_Closures(::HIR::Crate& crate)
{
    OuterVisitor    ov(crate);
    ov.visit_crate( crate );

    struct OuterVisitorPass2: public HIR::Visitor {
        StaticTraitResolve  m_resolve;

    public:
        OuterVisitorPass2(const ::HIR::Crate& crate)
            : m_resolve(crate)
        {}
        void fix_type(HIR::TypeRef& ty) const {
            MonomorphiserNop    mm;
            ExprVisitor_Fixup   fixup { m_resolve.m_crate, nullptr, mm, nullptr };
            visit_ty_with(ty, [&fixup](const HIR::TypeRef& ty)->bool {
                if( const auto* e = ty.data().opt_ErasedType() )
                {
                    if( const auto* ee = e->m_inner.opt_Alias() )
                    {
                        fixup.visit_type(ee->inner->type);
                    }
                }
                return false;
                });
        }
        void visit_type_alias(::HIR::ItemPath p, ::HIR::TypeAlias& item) override {
            HIR::Visitor::visit_type_alias(p, item);
            fix_type(item.m_type);
        }
        void visit_trait_impl(const ::HIR::SimplePath& trait_path, ::HIR::TraitImpl& impl) override {
            HIR::Visitor::visit_trait_impl(trait_path, impl);
            for(auto& t : impl.m_types) {
                fix_type(t.second.data);
            }
        }
    };
    OuterVisitorPass2(crate).visit_crate(crate);
}

