diff options
| author | John Hodge <tpg@mutabah.net> | 2016-08-24 17:12:45 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2016-08-24 17:12:45 +0800 |
| commit | 620876e10d1cb21c78867231c413390dd626e953 (patch) | |
| tree | 033c08d0131e117ca0859b09b41270ca9111f41e | |
| parent | 5d2845c393f7567bd7f5d6c3abc54514f7f99534 (diff) | |
| download | mrust-620876e10d1cb21c78867231c413390dd626e953.tar.gz | |
HIR Expand Closures - Fix mangling of destructured arguments
| -rw-r--r-- | src/hir_expand/closures.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/hir_expand/closures.cpp b/src/hir_expand/closures.cpp index f4734036..45ff24a3 100644 --- a/src/hir_expand/closures.cpp +++ b/src/hir_expand/closures.cpp @@ -140,16 +140,16 @@ namespace { static void fix_fn_params(::HIR::ExprPtr& code, const ::HIR::TypeRef& self_ty, const ::HIR::TypeRef& args_ty) { 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 { - assert( code.m_bindings.size() >= 2 ); + // Bindings present - Actual code (which destructures `args`) + assert( code.m_bindings.size() >= 1 ); assert( code.m_bindings[0] == ::HIR::TypeRef() ); - assert( code.m_bindings[1] == ::HIR::TypeRef() ); code.m_bindings[0] = self_ty.clone(); - code.m_bindings[1] = args_ty.clone(); } } static ::HIR::TraitImpl make_fnonce( @@ -396,7 +396,6 @@ namespace { DEBUG("--- Build locals and captures"); ::std::vector< ::HIR::TypeRef> local_types; local_types.push_back( ::HIR::TypeRef() ); // self - filled by make_fn* - local_types.push_back( ::HIR::TypeRef() ); // args - filled by make_fn* for(const auto binding_idx : ent.local_vars) { auto ty_mono = monomorphise_type_with(sp, m_variable_types.at(binding_idx).clone(), monomorph_cb); local_types.push_back( mv$(ty_mono) ); |