X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor%2FNative%2FWriter.pm;h=b14ab4da7a2628f0c2aadfaa1b91f2e06e576fe5;hb=5394a1c721689ae6c3168a22dd92a0499e8d9744;hp=990952431656cb8f051dc9e0bd7b0db4fd79232b;hpb=6ff86beda3f9316950b0f1219eca277f9c12918e;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Writer.pm b/lib/Moose/Meta/Method/Accessor/Native/Writer.pm
index 9909524..b14ab4d 100644
--- a/lib/Moose/Meta/Method/Accessor/Native/Writer.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Writer.pm
@@ -5,11 +5,15 @@ use warnings;
 
 use List::MoreUtils qw( any );
 
-our $VERSION = '1.14';
+our $VERSION = '1.15';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use base 'Moose::Meta::Method::Accessor::Native';
+use Moose::Role;
+
+with 'Moose::Meta::Method::Accessor::Native';
+
+requires '_potential_value';
 
 sub _generate_method {
     my $self = shift;
@@ -61,7 +65,7 @@ sub _writer_core {
         $inv,
         $potential_value,
         $slot_access,
-        );
+        ) . ';';
     $code .= "\n" . $self->_inline_trigger( $inv, $slot_access, '@old' );
     $code .= "\n" . $self->_return_value( $slot_access, 'for writer' );
 
@@ -130,31 +134,33 @@ sub _inline_check_coercion {
     return "$value = \$type_constraint_obj->coerce($value);";
 }
 
-sub _inline_check_constraint {
+override _inline_check_constraint => sub {
     my $self = shift;
 
     return q{} unless $self->_constraint_must_be_checked;
 
-    return $self->SUPER::_inline_check_constraint( $_[0] );
-}
+    return super();
+};
 
 sub _inline_capture_return_value { return q{} }
 
 sub _inline_set_new_value {
     my $self = shift;
 
-    return $self->SUPER::_inline_store(@_)
-        if $self->_value_needs_copy;
+    return $self->_inline_store(@_)
+        if $self->_value_needs_copy || !$self->_slot_access_can_be_inlined;
 
     return $self->_inline_optimized_set_new_value(@_);
-}
+};
 
 sub _inline_optimized_set_new_value {
     my $self = shift;
 
-    return $self->SUPER::_inline_store(@_)
+    return $self->_inline_store(@_);
 }
 
 sub _return_value { return q{} }
 
+no Moose::Role;
+
 1;