Merge pull request #4292 from dotnet/nmirror

Merge nmirror to master

1 files changed, 7 insertions, 0 deletions

diff --git a/src/System.Private.TypeLoader/src/Internal/Runtime/DebuggerSupport/DebuggerSupport.cs b/src/System.Private.TypeLoader/src/Internal/Runtime/DebuggerSupport/DebuggerSupport.cs
index 1d4e68928..6750b721b 100644
--- a/src/System.Private.TypeLoader/src/Internal/Runtime/DebuggerSupport/DebuggerSupport.cs
+++ b/src/System.Private.TypeLoader/src/Internal/Runtime/DebuggerSupport/DebuggerSupport.cs
@@ -20,6 +20,7 @@ namespace Internal.Runtime.DebuggerSupport
     {
         private readonly NativeReader _nativeReader;
         private uint _offset;
+
         public unsafe LowLevelNativeFormatReader(byte* buffer, uint bufferSize)
         {
             _nativeReader = new NativeReader(buffer, bufferSize);
@@ -59,6 +60,11 @@ namespace Internal.Runtime.DebuggerSupport
             {
                 return _offset;
             }
+
+            set
+            {
+                this._offset = value;
+            }
         }
     }
 
@@ -118,6 +124,7 @@ namespace Internal.Runtime.DebuggerSupport
                                 ref parser,
                                 nativeLayoutContext);
             TypeSystemContextFactory.Recycle(typeSystemContext);
+            reader.Offset = parser.Offset;
             return objectTypeDesc;
         }
     }