Fix GC vars dump at call sites for arm/arm64 (#46056)

dotnet · Dec 15, 2020 · 35fbaef · 35fbaef
1 parent 264af40
commit 35fbaef
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/coreclr/jit/emitarm.cpp b/src/coreclr/jit/emitarm.cpp
@@ -6404,6 +6404,14 @@ size_t emitter::emitOutputInstr(insGroup* ig, instrDesc* id, BYTE** dp)
 
             emitUpdateLiveGCvars(GCvars, *dp);
 
+#ifdef DEBUG
+            // Output any delta in GC variable info, corresponding to the before-call GC var updates done above.
+            if (EMIT_GC_VERBOSE || emitComp->opts.disasmWithGC)
+            {
+                emitDispGCVarDelta();
+            }
+#endif // DEBUG
+
             // If the method returns a GC ref, mark R0 appropriately.
             if (id->idGCref() == GCT_GCREF)
                 gcrefRegs |= RBM_R0;

diff --git a/src/coreclr/jit/emitarm64.cpp b/src/coreclr/jit/emitarm64.cpp
@@ -10158,6 +10158,14 @@ unsigned emitter::emitOutputCall(insGroup* ig, BYTE* dst, instrDesc* id, code_t
 
     emitUpdateLiveGCvars(GCvars, dst);
 
+#ifdef DEBUG
+    // Output any delta in GC variable info, corresponding to the before-call GC var updates done above.
+    if (EMIT_GC_VERBOSE || emitComp->opts.disasmWithGC)
+    {
+        emitDispGCVarDelta();
+    }
+#endif // DEBUG
+
     // Now output the call instruction and update the 'dst' pointer
     //
     unsigned outputInstrSize = emitOutput_Instr(dst, code);