S_newONCEOP: correctly copy array/hash at subroutine exit

Should a _state_ array or hash be declared immediately prior to
returning, the error "Bizarre copy of HASH in subroutine exit" error
would be triggered. Now, the array or hash is returned without error.

Specifically:
 * Instead of always creating a PADSV, the appropriate padop is created.
 * The OPf_REF flag is switched off, allowing the return of the
   container variable's contents rather than the container SV itself.
 * The OPf_MOD & OPf_SPECIAL flags are switches off, as they are not
   relevant to this version of the padop.

Note: The op created has been renamed from "other" to "nextop", since
it is linked to the ONCE op via op_next, not op_other.

Fixes GH#18630

Author: richardleach

ext/B/t/optree_varinit.t

@@ -406,7 +406,7 @@ checkOptree ( name	=> 'void context state',
 # 4      <$> const[IV 1] s
 # 5      <1> padsv_store[$x:2,3] vKS/LVINTRO,STATE
 #            goto 6
-# 8  <0> padsv[$x:2,3] vRM*/STATE
+# 8  <0> padsv[$x:2,3] v/STATE
 # 6  <;> nextstate(main 3 -e:1) v:%,{,fea=15
 # 7  <@> leave[1 ref] vKP/REFC
 EOT_EOT
@@ -416,7 +416,7 @@ EOT_EOT
 # 4      <$> const(IV 1) s
 # 5      <1> padsv_store[$x:2,3] vKS/LVINTRO,STATE
 #            goto 6
-# 8  <0> padsv[$x:2,3] vRM*/STATE
+# 8  <0> padsv[$x:2,3] v/STATE
 # 6  <;> nextstate(main 3 -e:1) v:%,{,fea=15
 # 7  <@> leave[1 ref] vKP/REFC
 EONT_EONT
@@ -433,7 +433,7 @@ checkOptree ( name	=> 'scalar context state',
 # 5      <0> padsv[$x:2,3] sRM*/LVINTRO,STATE
 # 6      <2> sassign sKS/2
 #            goto 7
-# a  <0> padsv[$x:2,3] sRM*/STATE
+# a  <0> padsv[$x:2,3] s/STATE
 # 7  <1> padsv_store[$y:2,3] vKS/LVINTRO
 # 8  <;> nextstate(main 3 -e:1) v:%,{,fea=15
 # 9  <@> leave[1 ref] vKP/REFC
@@ -445,7 +445,7 @@ EOT_EOT
 # 5      <0> padsv[$x:2,3] sRM*/LVINTRO,STATE
 # 6      <2> sassign sKS/2
 #            goto 7
-# a  <0> padsv[$x:2,3] sRM*/STATE
+# a  <0> padsv[$x:2,3] s/STATE
 # 7  <1> padsv_store[$y:2,3] vKS/LVINTRO
 # 8  <;> nextstate(main 3 -e:1) v:%,{,fea=15
 # 9  <@> leave[1 ref] vKP/REFC

op.c

@@ -8596,18 +8596,18 @@ static OP *
 S_newONCEOP(pTHX_ OP *initop, OP *padop)
 {
     const PADOFFSET target = padop->op_targ;
-    OP *const other = newOP(OP_PADSV,
-                            padop->op_flags
+    OP *const nexop = newOP(padop->op_type,
+                            (padop->op_flags & ~(OPf_REF|OPf_MOD|OPf_SPECIAL))
                             | ((padop->op_private & ~OPpLVAL_INTRO) << 8));
     OP *const first = newOP(OP_NULL, 0);
-    OP *const nullop = newCONDOP(0, first, initop, other);
+    OP *const nullop = newCONDOP(0, first, initop, nexop);
     /* XXX targlex disabled for now; see ticket #124160
-        newCONDOP(0, first, S_maybe_targlex(aTHX_ initop), other);
+        newCONDOP(0, first, S_maybe_targlex(aTHX_ initop), nexop);
      */
     OP *const condop = first->op_next;
 
     OpTYPE_set(condop, OP_ONCE);
-    other->op_targ = target;
+    nexop->op_targ = target;
 
     /* Store the initializedness of state vars in a separate
        pad entry.  */

pod/perldelta.pod

@@ -401,7 +401,9 @@ manager will later use a regex to expand these into links.
 
 =item *
 
-XXX
+Declaring a lexically scoped array or hash using C<state> within a subroutine
+and then immediately returning no longer triggers a "Bizarre copy of HASH/ARRAY
+in subroutine exit" error. [GH #18630]
 
 =back
 

t/op/state.t

@@ -9,7 +9,7 @@ BEGIN {
 
 use strict;
 
-plan tests => 162;
+plan tests => 164;
 
 # Before loading feature.pm, test it with CORE::
 ok eval 'CORE::state $x = 1;', 'CORE::state outside of feature.pm scope';
@@ -504,7 +504,16 @@ for (1,2) {
         or diag "got these warnings:\n@warnings";
 }
 
+#  [GH #18630] Returning state hash-assign risks "Bizarre copy of HASH in subroutine exit"
+{
+    sub gh_18630H {state %h=(a=>1)}
+    my $res = join '', gh_18630H, gh_18630H;
+    is($res, "a1a1", 'HASH copied successfully in subroutine exit');
 
+    sub gh_18630A {state @a = qw(b 2)}
+    $res = join '', gh_18630A , gh_18630A;
+    is($res, "b2b2", 'ARRAY copied successfully in subroutine exit');
+}
 
 __DATA__
 (state $a) = 1;