Stash away spesh correlation ID earlier

So that it will always be the correct one.
MoarVM · Jul 22, 2021 · adfb5cd · adfb5cd
1 parent 48b6f4e
commit adfb5cd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/disp/inline_cache.c b/src/disp/inline_cache.c
@@ -94,6 +94,7 @@ static void dispatch_monomorphic(MVMThreadContext *tc,
         MVMDispInlineCacheEntry **entry_ptr, MVMDispInlineCacheEntry *seen,
         MVMString *id, MVMCallsite *callsite, MVMuint16 *arg_indices,
         MVMRegister *source, MVMStaticFrame *sf, MVMuint32 bytecode_offset) {
+    MVMint32 cid = tc->cur_frame->spesh_correlation_id;
     MVMDispProgram *dp = ((MVMDispInlineCacheEntryMonomorphicDispatch *)seen)->dp;
     MVMCallStackDispatchRun *record = MVM_callstack_allocate_dispatch_run(tc,
             dp->num_temporaries);
@@ -112,15 +113,16 @@ static void dispatch_monomorphic(MVMThreadContext *tc,
                 bytecode_offset);
     }
     else {
-        if (MVM_spesh_log_is_logging(tc))
-            MVM_spesh_log_dispatch_resolution(tc, bytecode_offset, 0);
+        if (MVM_spesh_log_is_logging(tc) && cid)
+            MVM_spesh_log_dispatch_resolution_for_correlation_id(tc, cid, bytecode_offset, 0);
     }
 }
 
 static void dispatch_monomorphic_flattening(MVMThreadContext *tc,
         MVMDispInlineCacheEntry **entry_ptr, MVMDispInlineCacheEntry *seen,
         MVMString *id, MVMCallsite *callsite, MVMuint16 *arg_indices,
         MVMRegister *source, MVMStaticFrame *sf, MVMuint32 bytecode_offset) {
+    MVMint32 cid = tc->cur_frame->spesh_correlation_id;
     /* First, perform flattening of the arguments. */
     MVMCallStackFlattening *flat_record = MVM_args_perform_flattening(tc, callsite,
             source, arg_indices);
@@ -140,8 +142,8 @@ static void dispatch_monomorphic_flattening(MVMThreadContext *tc,
         });
         if (outcome) {
             /* It matches, so we're ready to continue. */
-            if (MVM_spesh_log_is_logging(tc))
-                MVM_spesh_log_dispatch_resolution(tc, bytecode_offset, 0);
+            if (MVM_spesh_log_is_logging(tc) && cid)
+                MVM_spesh_log_dispatch_resolution_for_correlation_id(tc, cid, bytecode_offset, 0);
             return;
         }
         else {
@@ -161,6 +163,7 @@ static void dispatch_polymorphic(MVMThreadContext *tc,
         MVMDispInlineCacheEntry **entry_ptr, MVMDispInlineCacheEntry *seen,
         MVMString *id, MVMCallsite *callsite, MVMuint16 *arg_indices,
         MVMRegister *source, MVMStaticFrame *sf, MVMuint32 bytecode_offset) {
+    MVMint32 cid = tc->cur_frame->spesh_correlation_id;
     /* Set up dispatch run record. */
     MVMDispInlineCacheEntryPolymorphicDispatch *entry =
             (MVMDispInlineCacheEntryPolymorphicDispatch *)seen;
@@ -179,7 +182,7 @@ static void dispatch_polymorphic(MVMThreadContext *tc,
         });
         if (outcome) {
             if (MVM_spesh_log_is_logging(tc))
-                MVM_spesh_log_dispatch_resolution(tc, bytecode_offset, i);
+                MVM_spesh_log_dispatch_resolution_for_correlation_id(tc, cid, bytecode_offset, i);
             return;
         }
     }
@@ -195,6 +198,7 @@ static void dispatch_polymorphic_flattening(MVMThreadContext *tc,
         MVMDispInlineCacheEntry **entry_ptr, MVMDispInlineCacheEntry *seen,
         MVMString *id, MVMCallsite *callsite, MVMuint16 *arg_indices,
         MVMRegister *source, MVMStaticFrame *sf, MVMuint32 bytecode_offset) {
+    MVMint32 cid = tc->cur_frame->spesh_correlation_id;
     /* First, perform flattening of the arguments. */
     MVMCallStackFlattening *flat_record = MVM_args_perform_flattening(tc, callsite,
             source, arg_indices);
@@ -217,7 +221,7 @@ static void dispatch_polymorphic_flattening(MVMThreadContext *tc,
             });
             if (outcome) {
                 if (MVM_spesh_log_is_logging(tc))
-                    MVM_spesh_log_dispatch_resolution(tc, bytecode_offset, i);
+                    MVM_spesh_log_dispatch_resolution_for_correlation_id(tc, cid, bytecode_offset, i);
                 return;
             }
         }

diff --git a/src/spesh/log.c b/src/spesh/log.c
@@ -224,10 +224,9 @@ void MVM_spesh_log_return_to_unlogged(MVMThreadContext *tc) {
 }
 
 /* Log the result of a dispatch. */
-void MVM_spesh_log_dispatch_resolution(MVMThreadContext *tc, MVMuint32 bytecode_offset,
-                                       MVMuint16 result_index) {
+void MVM_spesh_log_dispatch_resolution_for_correlation_id(MVMThreadContext *tc,
+        MVMint32 cid, MVMuint32 bytecode_offset, MVMuint16 result_index) {
     MVMSpeshLog *sl = tc->spesh_log;
-    MVMint32 cid = tc->cur_frame->spesh_correlation_id;
     MVMSpeshLogEntry *entry = &(sl->body.entries[sl->body.used]);
     entry->kind = MVM_SPESH_LOG_DISPATCH_RESOLUTION;
     entry->id = cid;

diff --git a/src/spesh/log.h b/src/spesh/log.h
@@ -47,5 +47,5 @@ void MVM_spesh_log_invoke_target(MVMThreadContext *tc, MVMObject *invoke_target,
     MVMuint16 was_multi);
 void MVM_spesh_log_return_type(MVMThreadContext *tc, MVMObject *value);
 void MVM_spesh_log_return_to_unlogged(MVMThreadContext *tc);
-void MVM_spesh_log_dispatch_resolution(MVMThreadContext *tc, MVMuint32 bytecode_offset,
-        MVMuint16 guard_index);
+void MVM_spesh_log_dispatch_resolution_for_correlation_id(MVMThreadContext *tc,
+        MVMint32 cid, MVMuint32 bytecode_offset, MVMuint16 result_index);