From 56d4396ee7c93f2b514a1487fbe99ceaacfb4bfd Mon Sep 17 00:00:00 2001 From: EgorBo Date: Sat, 13 Sep 2025 11:50:14 +0200 Subject: [PATCH 1/2] check ImmedValNeedsReloc in genCreateAddrMode --- src/coreclr/jit/codegencommon.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/codegencommon.cpp b/src/coreclr/jit/codegencommon.cpp index e09df5fbdb33a0..f6d7fd469205f9 100644 --- a/src/coreclr/jit/codegencommon.cpp +++ b/src/coreclr/jit/codegencommon.cpp @@ -1483,7 +1483,7 @@ bool CodeGen::genCreateAddrMode(GenTree* addr, mul = 0; rv2 = nullptr; } - else if (index->IsIntCnsFitsInI32()) + else if (index->IsIntCnsFitsInI32() && !op2->AsIntConCommon()->ImmedValNeedsReloc(compiler)) { ssize_t constantIndex = index->AsIntConCommon()->IconValue() * indexScale; if (constantIndex == 0) From c6452e268052635033f39158aeea2ed2e5ed7dbf Mon Sep 17 00:00:00 2001 From: Egor Bogatov Date: Sat, 13 Sep 2025 11:52:45 +0200 Subject: [PATCH 2/2] Update src/coreclr/jit/codegencommon.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/coreclr/jit/codegencommon.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/codegencommon.cpp b/src/coreclr/jit/codegencommon.cpp index f6d7fd469205f9..0ffa6e8887f7cd 100644 --- a/src/coreclr/jit/codegencommon.cpp +++ b/src/coreclr/jit/codegencommon.cpp @@ -1483,7 +1483,7 @@ bool CodeGen::genCreateAddrMode(GenTree* addr, mul = 0; rv2 = nullptr; } - else if (index->IsIntCnsFitsInI32() && !op2->AsIntConCommon()->ImmedValNeedsReloc(compiler)) + else if (index->IsIntCnsFitsInI32() && !index->AsIntConCommon()->ImmedValNeedsReloc(compiler)) { ssize_t constantIndex = index->AsIntConCommon()->IconValue() * indexScale; if (constantIndex == 0)