Fix calculation in PREPARE_EXTERNAL_VAR[_INDIRECT] (#100117)

* Fix calculation in PREPARE_EXTERNAL_VAR[_INDIRECT] * Work around compiler-asserting tests --------- Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
dotnet · Mar 22, 2024 · 3cf7759 · 3cf7759
1 parent c68c2e6
commit 3cf7759
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/src/coreclr/nativeaot/Runtime/unix/unixasmmacrosarm.inc b/src/coreclr/nativeaot/Runtime/unix/unixasmmacrosarm.inc
@@ -77,13 +77,13 @@ C_FUNC(\Name):
 
 .macro PREPARE_EXTERNAL_VAR Name, HelperReg
         movw \HelperReg, #:lower16:C_FUNC(\Name) - (. + 12)
-        movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 12)
+        movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 8)
         add \HelperReg, pc
 .endm
 
 .macro PREPARE_EXTERNAL_VAR_INDIRECT Name, HelperReg
         movw \HelperReg, #:lower16:C_FUNC(\Name) - (. + 12)
-        movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 12)
+        movt \HelperReg, #:upper16:C_FUNC(\Name) - (. + 8)
         add \HelperReg, pc
         ldr \HelperReg, [\HelperReg]
 .endm

diff --git a/src/tests/JIT/Stress/ABI/pinvokes_d.csproj b/src/tests/JIT/Stress/ABI/pinvokes_d.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>

diff --git a/src/tests/JIT/Stress/ABI/pinvokes_do.csproj b/src/tests/JIT/Stress/ABI/pinvokes_do.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>

diff --git a/src/tests/JIT/Stress/ABI/stubs_do.csproj b/src/tests/JIT/Stress/ABI/stubs_do.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>

diff --git a/src/tests/JIT/Stress/ABI/tailcalls_d.csproj b/src/tests/JIT/Stress/ABI/tailcalls_d.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>

diff --git a/src/tests/JIT/Stress/ABI/tailcalls_do.csproj b/src/tests/JIT/Stress/ABI/tailcalls_do.csproj
@@ -10,6 +10,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- https://github.com/dotnet/runtime/issues/100125 -->
+    <NativeAotIncompatible>true</NativeAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>