From 3995f1f0081dcf53dba7e7a687be5761fabc4526 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Sat, 31 Jan 2026 14:53:31 +0100 Subject: [PATCH 1/3] Update superpmi-diffs queue to usx OSX.15.arm64 This queue has higher capacity than osx.14.arm64.open --- eng/pipelines/coreclr/templates/helix-queues-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index f2e7b6e6fde5bf..6069993b2d6089 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -128,7 +128,7 @@ jobs: - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: - $(helix_macos_arm64) - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: - - OSX.14.Arm64.Open + - OSX.15.Arm64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - OSX.14.Arm64 From 8ec621a3a3d3977067c43eba11412eccda9567fc Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Sat, 31 Jan 2026 14:53:51 +0100 Subject: [PATCH 2/3] Run diffs --- src/coreclr/jit/importer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp index f9785145fd823d..e73adac657e4fe 100644 --- a/src/coreclr/jit/importer.cpp +++ b/src/coreclr/jit/importer.cpp @@ -69,8 +69,8 @@ bool Compiler::impILConsumesAddr(const BYTE* codeAddr, const BYTE* codeEndp) void Compiler::impResolveToken(const BYTE* addr, CORINFO_RESOLVED_TOKEN* pResolvedToken, CorInfoTokenKind kind) { - pResolvedToken->tokenContext = impTokenLookupContextHandle; pResolvedToken->tokenScope = info.compScopeHnd; + pResolvedToken->tokenContext = impTokenLookupContextHandle; pResolvedToken->token = getU4LittleEndian(addr); pResolvedToken->tokenType = kind; From 386940413637e4b0669322d70213ab63f5c7691a Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Sat, 31 Jan 2026 19:49:13 +0100 Subject: [PATCH 3/3] Revert "Run diffs" This reverts commit 8ec621a3a3d3977067c43eba11412eccda9567fc. --- src/coreclr/jit/importer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp index e73adac657e4fe..f9785145fd823d 100644 --- a/src/coreclr/jit/importer.cpp +++ b/src/coreclr/jit/importer.cpp @@ -69,8 +69,8 @@ bool Compiler::impILConsumesAddr(const BYTE* codeAddr, const BYTE* codeEndp) void Compiler::impResolveToken(const BYTE* addr, CORINFO_RESOLVED_TOKEN* pResolvedToken, CorInfoTokenKind kind) { - pResolvedToken->tokenScope = info.compScopeHnd; pResolvedToken->tokenContext = impTokenLookupContextHandle; + pResolvedToken->tokenScope = info.compScopeHnd; pResolvedToken->token = getU4LittleEndian(addr); pResolvedToken->tokenType = kind;