Skip to content

Commit df3640c

Browse files
committed
Do fixup with the vastly less evil assign rather than copy. Just happens to fix half of the broken multi-sub tests.
1 parent c69b201 commit df3640c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/HLL/SerializationContextBuilder.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ class HLL::Compiler::SerializationContextBuilder {
385385
# Add it to the compile time meta-object.
386386
$obj.HOW."$meta_method_name"($obj, $name, $dummy);
387387

388-
# For fixup, need to copy the method body we actually compiled
388+
# For fixup, need to assign the method body we actually compiled
389389
# onto the one that went into the SC. Deserializing is easier -
390390
# just the straight meta-method call.
391391
my $slot_past := self.get_slot_past_for_object($obj);
@@ -398,7 +398,7 @@ class HLL::Compiler::SerializationContextBuilder {
398398
PAST::Val.new( :value($method_past) )
399399
)),
400400
:fixup_past(PAST::Op.new(
401-
:pirop('copy vPP'),
401+
:pirop('assign vPP'),
402402
self.get_slot_past_for_object($dummy),
403403
PAST::Val.new( :value($method_past) )
404404
)));
@@ -454,7 +454,7 @@ class HLL::Compiler::SerializationContextBuilder {
454454

455455
# Add fixup for the cloned code.
456456
$fixups.push(PAST::Op.new(
457-
:pirop('copy vPP'),
457+
:pirop('assign vPP'),
458458
self.get_slot_past_for_object($clone),
459459
PAST::Val.new( :value(pir::getprop__PsP('PAST', $meth)) )
460460
));

src/pmc/dispatchersub.pmc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pmclass DispatcherSub extends Sub auto_attrs dynpmc group nqp {
3030

3131
VTABLE void assign_pmc(PMC *other) {
3232
/* It's OK to assign another DispatcherSub or alternatively to
33-
* assign a Parrot Sub (our immediate parent); */
33+
* assign a Parrot Sub (our immediate parent). */
3434
if (other->vtable->base_type == SELF->vtable->base_type ||
3535
other->vtable->base_type == enum_class_Sub) {
3636
Parrot_Sub_attributes *my_sub;

0 commit comments

Comments
 (0)