tweak

Author: VSadov

src/coreclr/inc/gcinfodecoder.h

@@ -499,6 +499,7 @@ class GcInfoDecoder
     //------------------------------------------------------------------------
 
     bool IsInterruptible();
+    bool HasInterruptibleRanges();
 
 #ifdef PARTIALLY_INTERRUPTIBLE_GC_SUPPORTED
     bool IsSafePoint();

src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

@@ -224,31 +224,29 @@ void UnixNativeCodeManager::EnumGcRefs(MethodInfo *    pMethodInfo,
         // code is recorded with -1 skew, so we must adjust accordingly.
         codeOffset--;
     }
-    else
+
+    GcInfoDecoder decoder(
+        GCInfoToken(gcInfo),
+        GcInfoDecoderFlags(DECODE_GC_LIFETIMES | DECODE_SECURITY_OBJECT | DECODE_VARARG),
+        codeOffset
+    );
+
+    if (isActiveStackFrame)
     {
         // CONSIDER: We can optimize this by remembering the need to adjust in IsSafePoint and propagating into here.
         //           Or, better yet, maybe we should change the decoder to not require this adjustment.
         //           The scenario that adjustment tries to handle (fallthrough into BB with random liveness)
         //           does not seem possible.
-        GcInfoDecoder decoder1(
-            GCInfoToken(gcInfo),
-            GcInfoDecoderFlags(DECODE_INTERRUPTIBILITY),
-            codeOffset
-        );
-
-        if (!decoder1.IsInterruptible())
+        if (!decoder.HasInterruptibleRanges())
         {
-            assert(decoder1.IsSafePoint());
-            codeOffset--;
+            decoder = GcInfoDecoder(
+                GCInfoToken(gcInfo),
+                GcInfoDecoderFlags(DECODE_GC_LIFETIMES | DECODE_SECURITY_OBJECT | DECODE_VARARG),
+                codeOffset - 1
+            );
         }
     }
 
-    GcInfoDecoder decoder(
-        GCInfoToken(gcInfo),
-        GcInfoDecoderFlags(DECODE_GC_LIFETIMES | DECODE_SECURITY_OBJECT | DECODE_VARARG),
-        codeOffset
-    );
-
     ICodeManagerFlags flags = (ICodeManagerFlags)0;
     if (((UnixNativeMethodInfo*)pMethodInfo)->executionAborted)
         flags = ICodeManagerFlags::ExecutionAborted;

src/coreclr/nativeaot/Runtime/windows/CoffNativeCodeManager.cpp

@@ -397,31 +397,29 @@ void CoffNativeCodeManager::EnumGcRefs(MethodInfo *    pMethodInfo,
         // code is recorded with -1 skew, so we must adjust accordingly.
         codeOffset--;
     }
-    else
+
+    GcInfoDecoder decoder(
+        GCInfoToken(gcInfo),
+        GcInfoDecoderFlags(DECODE_GC_LIFETIMES | DECODE_SECURITY_OBJECT | DECODE_VARARG),
+        codeOffset
+    );
+
+    if (isActiveStackFrame)
     {
         // CONSIDER: We can optimize this by remembering the need to adjust in IsSafePoint and propagating into here.
         //           Or, better yet, maybe we should change the decoder to not require this adjustment.
         //           The scenario that adjustment tries to handle (fallthrough into BB with random liveness)
         //           does not seem possible.
-        GcInfoDecoder decoder1(
-            GCInfoToken(gcInfo),
-            GcInfoDecoderFlags(DECODE_INTERRUPTIBILITY),
-            codeOffset
-        );
-
-        if (!decoder1.IsInterruptible())
+        if (!decoder.HasInterruptibleRanges())
         {
-            assert(decoder1.IsSafePoint());
-            codeOffset--;
+            decoder = GcInfoDecoder(
+                GCInfoToken(gcInfo),
+                GcInfoDecoderFlags(DECODE_GC_LIFETIMES | DECODE_SECURITY_OBJECT | DECODE_VARARG),
+                codeOffset - 1
+            );
         }
     }
 
-    GcInfoDecoder decoder(
-        GCInfoToken(gcInfo),
-        GcInfoDecoderFlags(DECODE_GC_LIFETIMES | DECODE_SECURITY_OBJECT | DECODE_VARARG),
-        codeOffset
-    );
-
     ICodeManagerFlags flags = (ICodeManagerFlags)0;
     if (((CoffNativeMethodInfo *)pMethodInfo)->executionAborted)
         flags = ICodeManagerFlags::ExecutionAborted;

src/coreclr/vm/gcinfodecoder.cpp

@@ -397,6 +397,12 @@ bool GcInfoDecoder::IsInterruptible()
     return m_IsInterruptible;
 }
 
+bool GcInfoDecoder::HasInterruptibleRanges()
+{
+    _ASSERTE(m_Flags & (DECODE_INTERRUPTIBILITY | DECODE_GC_LIFETIMES));
+    return m_NumInterruptibleRanges > 0;
+}
+
 bool GcInfoDecoder::IsSafePoint()
 {
     _ASSERTE(m_Flags & (DECODE_INTERRUPTIBILITY | DECODE_GC_LIFETIMES));