Give initialization of state variables START semantics.

src/Perl6/Actions.pm

@@ -1303,6 +1303,11 @@ class Perl6::Actions is HLL::Actions {
                             PAST::Op.new( :pirop('getinterp P') ), 'lexpad'));
                 }
             }
+
+            # Flag state declarators.
+            if $*SCOPE eq 'state' {
+                $past<state_declarator> := 1;
+            }
         }
         elsif $*SCOPE eq 'our' {
             if $*TYPENAME {
@@ -3129,6 +3134,11 @@ class Perl6::Actions is HLL::Actions {
             $past := PAST::Op.new(:pirop('perl6_container_store__0PP'),
                 $lhs_ast, $rhs_ast);
         }
+        if $lhs_ast<state_declarator> {
+            $past := PAST::Op.new( :pasttype('if'),
+                PAST::Op.new( :pirop('perl6_state_needs_init I') ),
+                $past);
+        }
         return $past;
     }
 

src/binder/bind.h

@@ -67,6 +67,10 @@ typedef struct {
  */
 #define PObj_P6BINDER_ALREADY_CHECKED_FLAG PObj_private0_FLAG
 
+/* Flags that the block has state variables and that this is the first time
+ * that we are visiting the block and so they need initializing. */
+#define PObj_P6LEXPAD_STATE_INIT_FLAG PObj_private1_FLAG
+
 /* Gets the ID of a 6model object PMC. */
 INTVAL Rakudo_smo_id(void);
 

src/ops/perl6.ops

@@ -1138,6 +1138,22 @@ inline op perl6_current_args_rpa(out PMC) :base_core {
 }
 
 
+/*
+
+=item perl6_state_needs_init(out INT)
+
+Returns a non-zero value if state variables need their initialization
+and START blocks should run.
+
+=cut
+
+*/
+inline op perl6_state_needs_init(out INT) :base_core {
+    PMC *cur_ctx = CURRENT_CONTEXT(interp);
+    $1 = PObj_flag_TEST(P6LEXPAD_STATE_INIT, cur_ctx)
+}
+
+
 /*
 
 =item perl6_is_list(out INT, in PMC)

src/pmc/perl6lexpad.pmc

@@ -1,6 +1,7 @@
 #include "pmc_perl6lexinfo.h"
 #include "../binder/sixmodelobject.h"
 #include "../binder/container.h"
+#include "../binder/bind.h"
 #include "pmc_sub.h"
 
 /* How StatixLexPad looks on the inside. */
@@ -244,6 +245,7 @@ Return the LexInfo PMC, if any or a Null PMC.
                         if (PMC_IS_NULL(state_stash)) {
                             state_stash = pmc_new(interp, enum_class_Hash);
                             VTABLE_set_attr_keyed(interp, p6sub, Block, CONST_STRING(interp, "$!state_vars"), state_stash);
+                            PObj_flag_SET(P6LEXPAD_STATE_INIT, (PMC *)ctx);
                         }
                         else {
                             cur_state = VTABLE_get_pmc_keyed_str(interp, state_stash, state);