[PATCH 4/7] update_stats_rcu_lock: favor PL_curcop instead of caller_cx

[Eric Wong <e@80x24.org>]

PL_curcop seems to actually work correctly for resolving the
current op, rather than walking up the stack.
---
 Mwrap.xs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/Mwrap.xs b/Mwrap.xs
index 92fc4de..a89578a 100644
--- a/Mwrap.xs
+++ b/Mwrap.xs
@@ -4,7 +4,6 @@
  * Disclaimer: I don't really know my way around XS or Perl internals well
  */
 #define _LGPL_SOURCE /* allows URCU to inline some stuff */
-#define NEED_caller_cx
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -295,33 +294,28 @@ static void update_stats_rcu_unlock(const struct src_loc *l)
 
 static struct src_loc *update_stats_rcu_lock(size_t size, uintptr_t caller)
 {
-	const PERL_CONTEXT *cx = NULL;
 	static const size_t xlen = sizeof(caller);
 	struct src_loc *k, *ret = 0;
 	char *dst;
+	const COP *cop;
 
 	if (caa_unlikely(!totals)) return 0;
 	if (locating++) goto out; /* do not recurse into another *alloc */
 
 	uatomic_add(&total_bytes_inc, size);
+	cop = PL_curcop;
 
 	rcu_read_lock();
-	cx = caller_cx(0, NULL);
-	if (cx) {
-		const char *ptr = OutCopFILE(cx->blk_oldcop);
-		const COP *lcop;
+	if (cop) {
+		const char *ptr = OutCopFILE(cop);
 		unsigned line;
 		size_t len;
 		size_t int_size = INT2STR_MAX;
 
-		if (!ptr) goto unknown;
+		if (!ptr)
+			goto unknown;
 
-		lcop = Perl_closest_cop(aTHX_ cx->blk_oldcop,
-					OpSIBLING(cx->blk_oldcop),
-					cx->blk_sub.retop, TRUE);
-		if (!lcop)
-			lcop = cx->blk_oldcop;
-		line = CopLINE(lcop);
+		line = CopLINE(cop);
 
 		/* avoid vsnprintf or anything which could call malloc here: */
 		len = strlen(ptr);