Postrelease opts

lib/MAST/Ops.nqp

@@ -858,8 +858,8 @@ BEGIN {
     2160,
     2163,
     2166,
-    2170,
-    2174,
+    2169,
+    2173,
     2177,
     2180,
     2183,
@@ -869,27 +869,37 @@ BEGIN {
     2195,
     2198,
     2201,
-    2204,
-    2207,
+    2206,
     2211,
-    2215,
-    2218,
-    2221,
-    2222,
-    2224,
+    2217,
+    2223,
     2226,
-    2228,
+    2229,
     2232,
-    2234,
-    2236,
-    2236,
-    2236,
-    2237,
-    2238,
-    2238,
+    2235,
     2239,
-    2241,
-    2245);
+    2243,
+    2246,
+    2249,
+    2250,
+    2252,
+    2254,
+    2256,
+    2260,
+    2262,
+    2264,
+    2271,
+    2278,
+    2285,
+    2288,
+    2288,
+    2288,
+    2289,
+    2290,
+    2290,
+    2291,
+    2293,
+    2297);
     MAST::Ops.WHO<@counts> := nqp::list_i(0,
     2,
     2,
@@ -1744,6 +1754,7 @@ BEGIN {
     3,
     3,
     3,
+    3,
     4,
     4,
     3,
@@ -1754,6 +1765,11 @@ BEGIN {
     3,
     3,
     3,
+    5,
+    5,
+    6,
+    6,
+    3,
     3,
     3,
     3,
@@ -1768,6 +1784,10 @@ BEGIN {
     4,
     2,
     2,
+    7,
+    7,
+    7,
+    3,
     0,
     0,
     1,
@@ -3940,6 +3960,9 @@ BEGIN {
     65,
     16,
     57,
+    65,
+    16,
+    57,
     66,
     65,
     16,
@@ -3960,6 +3983,9 @@ BEGIN {
     58,
     65,
     16,
+    34,
+    65,
+    16,
     65,
     16,
     65,
@@ -3972,6 +3998,28 @@ BEGIN {
     65,
     16,
     57,
+    66,
+    16,
+    128,
+    16,
+    33,
+    66,
+    16,
+    128,
+    16,
+    33,
+    66,
+    16,
+    128,
+    16,
+    33,
+    16,
+    66,
+    16,
+    128,
+    16,
+    33,
+    16,
     34,
     65,
     16,
@@ -4013,6 +4061,30 @@ BEGIN {
     65,
     65,
     65,
+    66,
+    16,
+    128,
+    65,
+    65,
+    16,
+    16,
+    66,
+    16,
+    128,
+    65,
+    65,
+    16,
+    16,
+    66,
+    16,
+    128,
+    65,
+    65,
+    16,
+    16,
+    34,
+    65,
+    16,
     128,
     65,
     65,
@@ -4877,40 +4949,50 @@ BEGIN {
     'sp_bind_i8', 850,
     'sp_bind_n', 851,
     'sp_bind_s', 852,
-    'sp_p6oget_o', 853,
-    'sp_p6ogetvt_o', 854,
-    'sp_p6ogetvc_o', 855,
-    'sp_p6oget_i', 856,
-    'sp_p6oget_n', 857,
-    'sp_p6oget_s', 858,
-    'sp_p6obind_o', 859,
-    'sp_p6obind_i', 860,
-    'sp_p6obind_n', 861,
-    'sp_p6obind_s', 862,
-    'sp_deref_get_i64', 863,
-    'sp_deref_get_n', 864,
-    'sp_deref_bind_i64', 865,
-    'sp_deref_bind_n', 866,
-    'sp_getlexvia_o', 867,
-    'sp_getlexvia_ins', 868,
-    'sp_getstringfrom', 869,
-    'sp_getwvalfrom', 870,
-    'sp_jit_enter', 871,
-    'sp_boolify_iter', 872,
-    'sp_boolify_iter_arr', 873,
-    'sp_boolify_iter_hash', 874,
-    'sp_cas_o', 875,
-    'sp_atomicload_o', 876,
-    'sp_atomicstore_o', 877,
-    'prof_enter', 878,
-    'prof_enterspesh', 879,
-    'prof_enterinline', 880,
-    'prof_enternative', 881,
-    'prof_exit', 882,
-    'prof_allocated', 883,
-    'ctw_check', 884,
-    'coverage_log', 885,
-    'breakpoint', 886);
+    'sp_bind_s_nowb', 853,
+    'sp_p6oget_o', 854,
+    'sp_p6ogetvt_o', 855,
+    'sp_p6ogetvc_o', 856,
+    'sp_p6oget_i', 857,
+    'sp_p6oget_n', 858,
+    'sp_p6oget_s', 859,
+    'sp_p6oget_bi', 860,
+    'sp_p6obind_o', 861,
+    'sp_p6obind_i', 862,
+    'sp_p6obind_n', 863,
+    'sp_p6obind_s', 864,
+    'sp_fastbox_i', 865,
+    'sp_fastbox_bi', 866,
+    'sp_fastbox_i_ic', 867,
+    'sp_fastbox_bi_ic', 868,
+    'sp_deref_get_i64', 869,
+    'sp_deref_get_n', 870,
+    'sp_deref_bind_i64', 871,
+    'sp_deref_bind_n', 872,
+    'sp_getlexvia_o', 873,
+    'sp_getlexvia_ins', 874,
+    'sp_getstringfrom', 875,
+    'sp_getwvalfrom', 876,
+    'sp_jit_enter', 877,
+    'sp_boolify_iter', 878,
+    'sp_boolify_iter_arr', 879,
+    'sp_boolify_iter_hash', 880,
+    'sp_cas_o', 881,
+    'sp_atomicload_o', 882,
+    'sp_atomicstore_o', 883,
+    'sp_add_I', 884,
+    'sp_sub_I', 885,
+    'sp_mul_I', 886,
+    'sp_bool_I', 887,
+    'prof_enter', 888,
+    'prof_enterspesh', 889,
+    'prof_enterinline', 890,
+    'prof_enternative', 891,
+    'prof_exit', 892,
+    'prof_allocated', 893,
+    'ctw_check', 894,
+    'coverage_log', 895,
+    'breakpoint', 896);
     MAST::Ops.WHO<@names> := nqp::list_s('no_op',
     'const_i8',
     'const_i16',
@@ -5764,16 +5846,22 @@ BEGIN {
     'sp_bind_i8',
     'sp_bind_n',
     'sp_bind_s',
+    'sp_bind_s_nowb',
     'sp_p6oget_o',
     'sp_p6ogetvt_o',
     'sp_p6ogetvc_o',
     'sp_p6oget_i',
     'sp_p6oget_n',
     'sp_p6oget_s',
+    'sp_p6oget_bi',
     'sp_p6obind_o',
     'sp_p6obind_i',
     'sp_p6obind_n',
     'sp_p6obind_s',
+    'sp_fastbox_i',
+    'sp_fastbox_bi',
+    'sp_fastbox_i_ic',
+    'sp_fastbox_bi_ic',
     'sp_deref_get_i64',
     'sp_deref_get_n',
     'sp_deref_bind_i64',
@@ -5789,6 +5877,10 @@ BEGIN {
     'sp_cas_o',
     'sp_atomicload_o',
     'sp_atomicstore_o',
+    'sp_add_I',
+    'sp_sub_I',
+    'sp_mul_I',
+    'sp_bool_I',
     'prof_enter',
     'prof_enterspesh',
     'prof_enterinline',

src/6model/6model.h

@@ -149,6 +149,10 @@ typedef enum {
     /* Has this item been chained into a gen2 freelist? This is only used in
      * GC debug more. */
     MVM_CF_DEBUG_IN_GEN2_FREE_LIST = 4096,
+
+    /* Is this object a nursery object that has been referenced from gen2?
+     * Used to promote it earlier. */
+    MVM_CF_REF_FROM_GEN2 = 8192,
 } MVMCollectableFlags;
 
 #ifdef MVM_USE_OVERFLOW_SERIALIZATION_INDEX

src/6model/reprs/MVMContext.c

@@ -346,6 +346,23 @@ MVMFrame * MVM_context_get_frame(MVMThreadContext *tc, MVMContext *ctx) {
     return result;
 }
 
+/* Resolves the context to an exact frame; if the frame in question is an
+ * inline, takes the inline's outer. Returns NULL if neither resolves. */
+MVMFrame * MVM_context_get_frame_or_outer(MVMThreadContext *tc, MVMContext *ctx) {
+    MVMSpeshFrameWalker fw;
+    MVMFrame *result = NULL;
+    MVM_spesh_frame_walker_init(tc, &fw, ctx->body.context, 0);
+    if (apply_traversals(tc, &fw, ctx->body.traversals, ctx->body.num_traversals)) {
+        result = MVM_spesh_frame_walker_get_frame(tc, &fw);
+        if (!result) {
+            MVM_spesh_frame_walker_move_outer(tc, &fw);
+            result = MVM_spesh_frame_walker_get_frame(tc, &fw);
+        }
+    }
+    MVM_spesh_frame_walker_cleanup(tc, &fw);
+    return result;
+}
+
 /* Resolves the context and gets a hash of its lexicals. */
 MVMObject * MVM_context_lexicals_as_hash(MVMThreadContext *tc, MVMContext *ctx) {
     MVMSpeshFrameWalker fw;

src/6model/reprs/MVMContext.h

@@ -33,6 +33,7 @@ const MVMREPROps * MVMContext_initialize(MVMThreadContext *tc);
 MVM_PUBLIC MVMObject * MVM_context_from_frame(MVMThreadContext *tc, MVMFrame *f);
 MVMObject * MVM_context_apply_traversal(MVMThreadContext *tc, MVMContext *ctx, MVMuint8 traversal);
 MVMFrame * MVM_context_get_frame(MVMThreadContext *tc, MVMContext *ctx);
+MVMFrame * MVM_context_get_frame_or_outer(MVMThreadContext *tc, MVMContext *ctx);
 MVMObject * MVM_context_lexicals_as_hash(MVMThreadContext *tc, MVMContext *ctx);
 MVMint64 MVM_context_lexical_primspec(MVMThreadContext *tc, MVMContext *ctx, MVMString *name);
 MVMObject * MVM_context_get_code(MVMThreadContext *tc, MVMContext *ctx);

src/6model/reprs/MVMHash.c

@@ -218,12 +218,17 @@ static void spesh(MVMThreadContext *tc, MVMSTable *st, MVMSpeshGraph *g, MVMSpes
         if (!(st->mode_flags & MVM_FINALIZE_TYPE)) {
             MVMSpeshOperand target   = ins->operands[0];
             MVMSpeshOperand type     = ins->operands[1];
+            MVMSpeshFacts *tgt_facts = MVM_spesh_get_facts(tc, g, target);
+
             ins->info                = MVM_op_get_op(MVM_OP_sp_fastcreate);
             ins->operands            = MVM_spesh_alloc(tc, g, 3 * sizeof(MVMSpeshOperand));
             ins->operands[0]         = target;
             ins->operands[1].lit_i16 = sizeof(MVMHash);
             ins->operands[2].lit_i16 = MVM_spesh_add_spesh_slot(tc, g, (MVMCollectable *)st);
             MVM_spesh_usages_delete_by_reg(tc, g, type, ins);
+
+            tgt_facts->flags |= MVM_SPESH_FACT_KNOWN_TYPE | MVM_SPESH_FACT_CONCRETE;
+            tgt_facts->type = st->WHAT;
         }
         break;
     }