From: Steve Peters <steve@fisharerojo.org>
Date: Tue, 15 May 2007 18:56:23 +0000 (+0000)
Subject: Move pmop.op_pmflags back to its previous location.  The move in
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=69bdead35873e670ffd15dfa42a90b25b12af16c;p=p5sagit%2Fp5-mst-13.2.git

Move pmop.op_pmflags back to its previous location.  The move in
change #31218 was causing segfaults in miniperl on 32-bit
environments.
p4raw-link: @31218 on //depot/perl: d7f23a062a625a1f0067a15d3cea5401ea21006c

p4raw-id: //depot/perl@31224
---

diff --git a/op.h b/op.h
index 2d46fcf..e1d56fa 100644
--- a/op.h
+++ b/op.h
@@ -315,7 +315,6 @@ struct pmop {
     BASEOP
     /* On LP64 putting this here takes advantage of the fact that BASEOP isn't
        an exact multiple of 8 bytes to save structure padding.  */
-    U32		op_pmflags;
     OP *	op_first;
     OP *	op_last;
 #ifdef USE_ITHREADS
@@ -323,6 +322,7 @@ struct pmop {
 #else
     REGEXP *    op_pmregexp;            /* compiled expression */
 #endif
+    U32         op_pmflags;
     union {
 	OP *	op_pmreplroot;		/* For OP_SUBST */
 #ifdef USE_ITHREADS