Syncronize to Class-MOP/80457d1

diff --git a/moose.h b/moose.h
index e86b88a..f70a142 100644 (file)
--- a/moose.h
+++ b/moose.h
@@ -16,7 +16,7 @@ XS(moose_xs_accessor);
 XS(moose_xs_reader);
 XS(moose_xs_writer);
 
-CV* moose_instantiate_xs_accessor(pTHX_ SV* const accessor, XSPROTO(accessor_impl), const mop_instance_vtbl* const instance_vtbl);
+CV* moose_instantiate_xs_accessor(pTHX_ SV* const accessor, XSUBADDR_t const accessor_impl, mop_instance_vtbl* const instance_vtbl);
 
 
 

diff --git a/xs/moose_accessor.c b/xs/moose_accessor.c
index 5402a85..31934d4 100644 (file)
--- a/xs/moose_accessor.c
+++ b/xs/moose_accessor.c
@@ -70,12 +70,9 @@ moose_debug_mi_access(pTHX_ AV* const mi, I32 const attr_ix){
 #endif
 
 CV*
-moose_instantiate_xs_accessor(pTHX_ SV* const accessor, XSPROTO(accessor_impl), const mop_instance_vtbl* const instance_vtbl){
-    SV* const attr      = mop_call0_pvs(accessor,  "associated_attribute");
-    SV* const key       = mop_call0_pvs(attr, "name");
-    STRLEN klen;
-    const char* const kpv = SvPV_const(key, klen);
-    CV* const xsub        = mop_install_accessor(aTHX_ NULL /* anonymous */, kpv, klen, accessor_impl, instance_vtbl);
+moose_instantiate_xs_accessor(pTHX_ SV* const accessor, XSUBADDR_t const accessor_impl, mop_instance_vtbl* const instance_vtbl){
+    SV* const attr = mop_call0_pvs(accessor,  "associated_attribute");
+    CV* const xsub = mop_instantiate_xs_accessor(aTHX_ accessor, accessor_impl, instance_vtbl);
     dMOP_mg(xsub);
 
     SV* const slot = MOP_mg_slot(mg);