Merge pull request #135 from MichalStrehovsky/rodata-halfway

Half-implementation of RyuJIT generated ROData blocks

1 files changed, 17 insertions, 1 deletions

diff --git a/src/JitInterface/src/CorInfoImpl.cs b/src/JitInterface/src/CorInfoImpl.cs
index 23a7a5876..a4ffc22f7 100644
--- a/src/JitInterface/src/CorInfoImpl.cs
+++ b/src/JitInterface/src/CorInfoImpl.cs
@@ -1810,7 +1810,23 @@ namespace Internal.JitInterface
             Debug.Assert(locationBlock >= 0);
             reloc.Block = (sbyte)locationBlock;
 
-            reloc.Target = HandleToObject((IntPtr)target);
+            int targetOffset;
+            int targetBlock = findKnownBlock(target, out targetOffset);
+            if (targetBlock < 0)
+            {
+                // Reloc points to something outside of the generated blocks
+                reloc.Target = HandleToObject((IntPtr)target);
+            }
+            else
+            {
+                // Target is relative to one of the blocks
+                reloc.Target = new BlockRelativeTarget
+                {
+                    Block = (sbyte)targetBlock,
+                    Offset = targetOffset
+                };
+            }
+
             reloc.Delta = addlDelta;
 
             if (_relocs == null)