Merge pull request #2780 from vrurg/issue_2772

Fixed method cloning
rakudo · Mar 22, 2019 · 411a415 · 411a415
2 parents 787d5bf + ed29caa
commit 411a415
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CREDITS b/CREDITS
@@ -887,4 +887,8 @@ N: Oleksii Varianyk
 U: cono
 E: q@cono.org.ua
 
+N: Vadim Belman
+U: vrurg
+E: vrurg@cpan.org
+
 =cut
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.nqp b/src/Perl6/Metamodel/BOOTSTRAP.nqp
@@ -1212,7 +1212,7 @@ class ContainerDescriptor::BindArrayPos2D does ContainerDescriptor::Whence {
         $self
     }
 
-    method name() { 
+    method name() {
         'element at [' ~ $!one ~ ',' ~ $!two ~ ']'  # XXX name ?
     }
     method assigned($scalar) {

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -2472,6 +2472,10 @@ class Perl6::World is HLL::World {
             unless $precomp {
                 $compiler_thunk();
             }
+            my $code_obj := nqp::getcodeobj(nqp::curcode());
+            unless nqp::isnull($code_obj) {
+                return $code_obj(|@pos, |%named);
+            }
             $precomp(|@pos, |%named);
         });
         @compstuff[1] := $compiler_thunk;
@@ -2511,6 +2515,7 @@ class Perl6::World is HLL::World {
                     self.context().add_cleanup_task(sub () {
                         nqp::bindattr($clone, $code_type, '@!compstuff', nqp::null());
                     });
+                    self.context().add_clone_for_cuid($clone, $cuid);
                     my $tmp := $fixups.unique('tmp_block_fixup');
                     $fixups.push(QAST::Stmt.new(
                         QAST::Op.new(