arybase.xs: Always check the op type in ck_*

Sometimes the previous check function will have replaced the op
with one of a different type.  In that case, the rest of arybase’s
check function does not apply and can even cause a crash for ops
with no children (e.g., $x=wait is optimised down to a simple wait
op with no children and with op_targ pointing to $x, if it is
lexical).

diff --git a/ext/arybase/arybase.xs b/ext/arybase/arybase.xs
index a2806dd..5c653e3 100644 (file)
--- a/ext/arybase/arybase.xs
+++ b/ext/arybase/arybase.xs
@@ -166,23 +166,23 @@ STATIC void ab_process_assignment(pTHX_ OP *left, OP *right) {
 
 STATIC OP *ab_ck_sassign(pTHX_ OP *o) {
  o = (*ab_old_ck_sassign)(aTHX_ o);
- {
+ if (o->op_type == OP_SASSIGN) {
   OP *right = cBINOPx(o)->op_first;
   OP *left = right->op_sibling;
   if (left) ab_process_assignment(left, right);
-  return o;
  }
+ return o;
 }
 
 STATIC OP *ab_ck_aassign(pTHX_ OP *o) {
  o = (*ab_old_ck_aassign)(aTHX_ o);
- {
+ if (o->op_type == OP_AASSIGN) {
   OP *right = cBINOPx(o)->op_first;
   OP *left = cBINOPx(right->op_sibling)->op_first->op_sibling;
   right = cBINOPx(right)->op_first->op_sibling;
   ab_process_assignment(left, right);
-  return o;
  }
+ return o;
 }
 
 void