[Bast-commits] r4460 - trunk/Devel-Declare

matthewt at dev.catalyst.perl.org matthewt at dev.catalyst.perl.org
Tue Jun 3 16:02:02 BST 2008


Author: matthewt
Date: 2008-06-03 16:02:01 +0100 (Tue, 03 Jun 2008)
New Revision: 4460

Modified:
   trunk/Devel-Declare/Changes
   trunk/Devel-Declare/Declare.xs
Log:
fix the fucking segfault

Modified: trunk/Devel-Declare/Changes
===================================================================
--- trunk/Devel-Declare/Changes	2008-06-03 07:27:46 UTC (rev 4459)
+++ trunk/Devel-Declare/Changes	2008-06-03 15:02:01 UTC (rev 4460)
@@ -1,5 +1,6 @@
 Changes for Devel-Declare
 
+  - only mangle evals if o->op_ppaddr is actually PL_ppaddr[OP_ENTERVAL]
   - don't set OPf_SPECIAL on entereval ops, mistaken cargo cult from autobox
   - fix traits code to work on older 5.8.x perls
 

Modified: trunk/Devel-Declare/Declare.xs
===================================================================
--- trunk/Devel-Declare/Declare.xs	2008-06-03 07:27:46 UTC (rev 4459)
+++ trunk/Devel-Declare/Declare.xs	2008-06-03 15:02:01 UTC (rev 4460)
@@ -296,7 +296,8 @@
 
 STATIC OP *dd_ck_entereval(pTHX_ OP *o) {
   o = dd_old_ck_entereval(aTHX_ o); /* let the original do its job */
-  o->op_ppaddr = dd_pp_entereval;
+  if (o->op_ppaddr == PL_ppaddr[OP_ENTEREVAL])
+    o->op_ppaddr = dd_pp_entereval;
   return o;
 }
 




More information about the Bast-commits mailing list