Fix reversed code offsets in GcInfo (#111792)

dotnet · Jan 24, 2025 · 6c73c19 · 6c73c19
1 parent 6acb17a
commit 6c73c19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/Amd64/GcInfo.cs b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/Amd64/GcInfo.cs
@@ -381,8 +381,8 @@ private List<InterruptibleRange> EnumerateInterruptibleRanges(byte[] image, int
                 uint normRangeStartOffset = normLastinterruptibleRangeStopOffset + normStartDelta;
                 uint normRangeStopOffset = normRangeStartOffset + normStopDelta;
 
-                uint rangeStartOffset = _gcInfoTypes.DenormalizeCodeOffset(normRangeStopOffset);
-                uint rangeStopOffset = _gcInfoTypes.DenormalizeCodeOffset(normRangeStartOffset);
+                uint rangeStartOffset = _gcInfoTypes.DenormalizeCodeOffset(normRangeStartOffset);
+                uint rangeStopOffset = _gcInfoTypes.DenormalizeCodeOffset(normRangeStopOffset);
                 ranges.Add(new InterruptibleRange(i, rangeStartOffset, rangeStopOffset));
 
                 normLastinterruptibleRangeStopOffset = normRangeStopOffset;

diff --git a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/Amd64/GcTransition.cs b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/Amd64/GcTransition.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Reflection.PortableExecutable;
 using System.Text;
 
@@ -16,6 +17,7 @@ public struct InterruptibleRange
         public InterruptibleRange(uint index, uint start, uint stop)
         {
             Index = index;
+            Debug.Assert(start <= stop);
             StartOffset = start;
             StopOffset = stop;
         }