Change 31461 by [EMAIL PROTECTED] on 2007/06/25 11:41:35
Subject: [PATCH] remove op_static
From: Paul Johnson <[EMAIL PROTECTED]>
Date: Fri, 22 Jun 2007 02:13:20 +0200
Message-ID: <[EMAIL PROTECTED]>
Plus version bumps
Affected files ...
... //depot/perl/ext/B/B.pm#81 edit
... //depot/perl/ext/B/B.xs#138 edit
... //depot/perl/ext/B/B/Concise.pm#70 edit
... //depot/perl/ext/B/B/Debug.pm#30 edit
... //depot/perl/op.c#945 edit
... //depot/perl/op.h#185 edit
Differences ...
==== //depot/perl/ext/B/B.pm#81 (text) ====
Index: perl/ext/B/B.pm
--- perl/ext/B/B.pm#80~31164~ 2007-05-07 07:53:05.000000000 -0700
+++ perl/ext/B/B.pm 2007-06-25 04:41:35.000000000 -0700
@@ -7,7 +7,7 @@
#
package B;
-our $VERSION = '1.15';
+our $VERSION = '1.16';
use XSLoader ();
require Exporter;
@@ -1017,8 +1017,6 @@
=item opt
-=item static
-
=item flags
=item private
==== //depot/perl/ext/B/B.xs#138 (text) ====
Index: perl/ext/B/B.xs
--- perl/ext/B/B.xs#137~31333~ 2007-06-05 03:10:33.000000000 -0700
+++ perl/ext/B/B.xs 2007-06-25 04:41:35.000000000 -0700
@@ -845,7 +845,6 @@
#define OP_type(o) o->op_type
#if PERL_VERSION >= 9
# define OP_opt(o) o->op_opt
-# define OP_static(o) o->op_static
#else
# define OP_seq(o) o->op_seq
#endif
@@ -912,10 +911,6 @@
OP_opt(o)
B::OP o
-U8
-OP_static(o)
- B::OP o
-
#else
U16
==== //depot/perl/ext/B/B/Concise.pm#70 (text) ====
Index: perl/ext/B/B/Concise.pm
--- perl/ext/B/B/Concise.pm#69~31333~ 2007-06-05 03:10:33.000000000 -0700
+++ perl/ext/B/B/Concise.pm 2007-06-25 04:41:35.000000000 -0700
@@ -14,7 +14,7 @@
use Exporter (); # use #5
-our $VERSION = "0.71";
+our $VERSION = "0.72";
our @ISA = qw(Exporter);
our @EXPORT_OK = qw( set_style set_style_standard add_callback
concise_subref concise_cv concise_main
@@ -817,7 +817,6 @@
$h{seq} = "" if $h{seq} eq "-";
if ($] > 5.009) {
$h{opt} = $op->opt;
- $h{static} = $op->static;
$h{label} = $labels{$$op};
} else {
$h{seqnum} = $op->seq;
@@ -1502,13 +1501,6 @@
Only available in 5.9 and later.
-=item B<#static>
-
-Whether or not the op is statically defined. This flag is used by the
-B::C compiler backend and indicates that the op should not be freed.
-
-Only available in 5.9 and later.
-
=item B<#sibaddr>
The address of the OP's next youngest sibling, in hexadecimal.
==== //depot/perl/ext/B/B/Debug.pm#30 (text) ====
Index: perl/ext/B/B/Debug.pm
--- perl/ext/B/B/Debug.pm#29~31164~ 2007-05-07 07:53:05.000000000 -0700
+++ perl/ext/B/B/Debug.pm 2007-06-25 04:41:35.000000000 -0700
@@ -1,6 +1,6 @@
package B::Debug;
-our $VERSION = '1.04';
+our $VERSION = '1.05';
use strict;
use B qw(peekop class walkoptree walkoptree_exec
@@ -19,9 +19,8 @@
op_type %d
EOT
if ($] > 5.009) {
- printf <<'EOT', $op->opt, $op->static;
+ printf <<'EOT', $op->opt;
op_opt %d
- op_static %d
EOT
} else {
printf <<'EOT', $op->seq;
==== //depot/perl/op.c#945 (text) ====
Index: perl/op.c
--- perl/op.c#944~31388~ 2007-06-15 04:17:50.000000000 -0700
+++ perl/op.c 2007-06-25 04:41:35.000000000 -0700
@@ -423,7 +423,7 @@
dVAR;
OPCODE type;
- if (!o || o->op_static)
+ if (!o)
return;
if (o->op_latefreed) {
if (o->op_latefree)
==== //depot/perl/op.h#185 (text) ====
Index: perl/op.h
--- perl/op.h#184~31228~ 2007-05-16 00:32:20.000000000 -0700
+++ perl/op.h 2007-06-25 04:41:35.000000000 -0700
@@ -19,20 +19,17 @@
* op_type The type of the operation.
* op_opt Whether or not the op has been optimised by the
* peephole optimiser.
- * op_static Whether or not the op is statically defined.
- * This flag is used by the B::C compiler backend
- * and indicates that the op should not be freed.
*
* See the comments in S_clear_yystack() for more
* details on the following three flags:
-
+ *
* op_latefree tell op_free() to clear this op (and free any kids)
* but not yet deallocate the struct. This means that
* the op may be safely op_free()d multiple times
* op_latefreed an op_latefree op has been op_free()d
* op_attached this op (sub)tree has been attached to a CV
*
- * op_spare two spare bits!
+ * op_spare three spare bits!
* op_flags Flags common to all operations. See OPf_* below.
* op_private Flags peculiar to a particular operation (BUT,
* by default, set to the number of children until
@@ -63,11 +60,10 @@
PADOFFSET op_targ; \
unsigned op_type:9; \
unsigned op_opt:1; \
- unsigned op_static:1; \
unsigned op_latefree:1; \
unsigned op_latefreed:1; \
unsigned op_attached:1; \
- unsigned op_spare:2; \
+ unsigned op_spare:3; \
U8 op_flags; \
U8 op_private;
#endif
End of Patch.
