Remove some excess cleverness from the Bhk macros.

Allowing BhkENTRY(bhk, start) to look up the bhk_start member defeats
much of the point of having a bhk_ prefix in the first place: if a
member is added later called (say) 'bhk_die', any invocation of
BhkENTRY(bhk, die) will expand to BhkENTRY(bhk, Perl_die) because of the
API macros. Requiring BhkENTRY(bhk, bhk_start), while tedious, is much
safer.

1 files changed, 3 insertions, 3 deletions

diff --git a/op.c b/op.c
index 86b933fdae..e4ddfbc2a0 100644
--- a/op.c
+++ b/op.c
@@ -2345,7 +2345,7 @@ Perl_block_start(pTHX_ int full)
     SAVECOMPILEWARNINGS();
     PL_compiling.cop_warnings = DUP_WARNINGS(PL_compiling.cop_warnings);
 
-    CALL_BLOCK_HOOKS(start, full);
+    CALL_BLOCK_HOOKS(bhk_start, full);
 
     return retval;
 }
@@ -2357,7 +2357,7 @@ Perl_block_end(pTHX_ I32 floor, OP *seq)
     const int needblockscope = PL_hints & HINT_BLOCK_SCOPE;
     OP* retval = scalarseq(seq);
 
-    CALL_BLOCK_HOOKS(pre_end, &retval);
+    CALL_BLOCK_HOOKS(bhk_pre_end, &retval);
 
     LEAVE_SCOPE(floor);
     CopHINTS_set(&PL_compiling, PL_hints);
@@ -2365,7 +2365,7 @@ Perl_block_end(pTHX_ I32 floor, OP *seq)
 	PL_hints |= HINT_BLOCK_SCOPE; /* propagate out */
     pad_leavemy();
 
-    CALL_BLOCK_HOOKS(post_end, &retval);
+    CALL_BLOCK_HOOKS(bhk_post_end, &retval);
 
     return retval;
 }