From 4b65a9196162b345e7cbe8a43eca838c2e79e41b Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Sun, 6 Apr 2008 20:11:52 +0000
Subject: Replace all remaining accesses to COP's cop_label with CopLABEL().

p4raw-id: //depot/perl@33653
---
 dump.c     | 16 ++++++++--------
 ext/B/B.pm |  2 +-
 ext/B/B.xs |  2 +-
 pp_ctl.c   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dump.c b/dump.c
index 37337bbabe..29fb489c66 100644
--- a/dump.c
+++ b/dump.c
@@ -779,9 +779,9 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o)
 		if (CopSTASHPV(cCOPo))
 		    Perl_dump_indent(aTHX_ level, file, "PACKAGE = \"%s\"\n",
 				     CopSTASHPV(cCOPo));
-		if (cCOPo->cop_label)
+		if (CopLABEL(cCOPo))
 		    Perl_dump_indent(aTHX_ level, file, "LABEL = \"%s\"\n",
-				     cCOPo->cop_label);
+				     CopLABEL(cCOPo));
 	    }
 	}
 	else
@@ -1081,9 +1081,9 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o)
 	if (CopSTASHPV(cCOPo))
 	    Perl_dump_indent(aTHX_ level, file, "PACKAGE = \"%s\"\n",
 			     CopSTASHPV(cCOPo));
-	if (cCOPo->cop_label)
+	if (CopLABEL(cCOPo))
 	    Perl_dump_indent(aTHX_ level, file, "LABEL = \"%s\"\n",
-			     cCOPo->cop_label);
+			     CopLABEL(cCOPo));
 	break;
     case OP_ENTERLOOP:
 	Perl_dump_indent(aTHX_ level, file, "REDO ===> ");
@@ -2603,9 +2603,9 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o)
 		if (CopSTASHPV(cCOPo))
 		    PerlIO_printf(file, " package=\"%s\"",
 				     CopSTASHPV(cCOPo));
-		if (cCOPo->cop_label)
+		if (CopLABEL(cCOPo))
 		    PerlIO_printf(file, " label=\"%s\"",
-				     cCOPo->cop_label);
+				     CopLABEL(cCOPo));
 	    }
 	}
 	else
@@ -2864,9 +2864,9 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o)
 	if (CopSTASHPV(cCOPo))
 	    S_xmldump_attr(aTHX_ level, file, "package=\"%s\"",
 			     CopSTASHPV(cCOPo));
-	if (cCOPo->cop_label)
+	if (CopLABEL(cCOPo))
 	    S_xmldump_attr(aTHX_ level, file, "label=\"%s\"",
-			     cCOPo->cop_label);
+			     CopLABEL(cCOPo));
 	break;
     case OP_ENTERLOOP:
 	S_xmldump_attr(aTHX_ level, file, "redo=\"");
diff --git a/ext/B/B.pm b/ext/B/B.pm
index a212ae1a7d..5d491b4899 100644
--- a/ext/B/B.pm
+++ b/ext/B/B.pm
@@ -7,7 +7,7 @@
 #
 package B;
 
-our $VERSION = '1.19';
+our $VERSION = '1.20';
 
 use XSLoader ();
 require Exporter;
diff --git a/ext/B/B.xs b/ext/B/B.xs
index 9d65a720fa..714ac4d649 100644
--- a/ext/B/B.xs
+++ b/ext/B/B.xs
@@ -1195,7 +1195,7 @@ B::OP
 LOOP_lastop(o)
 	B::LOOP	o
 
-#define COP_label(o)	o->cop_label
+#define COP_label(o)	CopLABEL(o)
 #define COP_stashpv(o)	CopSTASHPV(o)
 #define COP_stash(o)	CopSTASH(o)
 #define COP_file(o)	CopFILE(o)
diff --git a/pp_ctl.c b/pp_ctl.c
index a3be377c1b..2783d69f86 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -2345,7 +2345,7 @@ S_dofindlabel(pTHX_ OP *o, const char *label, OP **opstack, OP **oplimit)
 	/* First try all the kids at this level, since that's likeliest. */
 	for (kid = cUNOPo->op_first; kid; kid = kid->op_sibling) {
 	    if ((kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE) &&
-		    kCOP->cop_label && strEQ(kCOP->cop_label, label))
+		    CopLABEL(kCOP) && strEQ(CopLABEL(kCOP), label))
 		return kid;
 	}
 	for (kid = cUNOPo->op_first; kid; kid = kid->op_sibling) {
-- 
cgit v1.2.1