Fix abstraction in private method codegen

sorear · Oct 4, 2010 · 94c51c8 · 94c51c8
1 parent 2fe5011
commit 94c51c8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/CSharpBackend.pm b/src/CSharpBackend.pm
@@ -316,6 +316,11 @@ sub resolve_lex {
         bless $op, ref($nn);
 
         resolve_lex($body, $_) for @{ $op->zyg };
+    } elsif ($opc eq 'class_ref') {
+        my $cl = $unit->deref([ @rest ]);
+        my $nn = CgOp::rawsget($cl->{peer}{$arg});
+        %$op = %$nn;
+        bless $op, ref($nn);
     } elsif ($opc eq 'let') {
         local $haslet{$arg} = 1;
 

diff --git a/src/CgOp.pm b/src/CgOp.pm
@@ -190,6 +190,8 @@ use warnings;
         CgOp->new(op => [ scopelex => $n ], zyg => [ @_ ]);
     }
 
+    sub class_ref { CgOp->new(op => [ class_ref => @_ ]); }
+
     sub _process_arglist {
         my $ar = shift;
         my @sig;

diff --git a/src/Op.pm b/src/Op.pm
@@ -194,7 +194,10 @@ use CgOp;
         my ($self, $body) = @_;
         if ($self->private) {
             # XXX encapsulation break
-            CgOp::subcall(CgOp::rawcall(CgOp::rawsget($body->unit->deref($self->pclass)->{peer}{mo}), "GetPrivateMethod", CgOp::clr_string($self->name)), $self->receiver->cgop($body), $self->argblock($body));
+            CgOp::subcall(CgOp::rawcall(
+                    CgOp::class_ref('mo', @{ $self->pclass }),
+                    "GetPrivateMethod", CgOp::clr_string($self->name)),
+                $self->receiver->cgop($body), $self->argblock($body));
         } else {
             CgOp::methodcall($self->receiver->cgop($body),
                 $self->name, $self->argblock($body));