Skip to content

Fix interp thread context offset for x64 apple platforms#3275

Merged
akoeplinger merged 1 commit intomainfrom
jkoritzinsky-patch-1
Nov 10, 2025
Merged

Fix interp thread context offset for x64 apple platforms#3275
akoeplinger merged 1 commit intomainfrom
jkoritzinsky-patch-1

Conversation

@jkoritzinsky
Copy link
Member

@jkoritzinsky jkoritzinsky commented Nov 7, 2025

Should unblock official builds.

@jkoritzinsky
Copy link
Member Author

jkoritzinsky commented Nov 7, 2025

/azp run dotnet-unified-build-full

@dotnet-policy-service dotnet-policy-service bot requested a review from a team November 7, 2025 19:48
@azure-pipelines
Copy link

azure-pipelines bot commented Nov 7, 2025

Azure Pipelines successfully started running 1 pipeline(s).

Copilot AI reviewed Nov 7, 2025
View reviewed changes
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds debug/release conditional compilation for the OFFSETOF__Thread__m_pInterpThreadContext offset definition on Unix AMD64 platforms. The Thread structure has different layouts between debug and release builds on Unix, requiring separate offset values (0xb08 for debug, 0x2a0 for release).

  • Adds _DEBUG preprocessor conditionals around the Unix-specific offset definition
  • Aligns AMD64 implementation with the existing ARM64 pattern
  • Maintains compile-time validation through ASMCONSTANTS_C_ASSERT

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@akoeplinger
Copy link
Member

akoeplinger commented Nov 10, 2025

the osx-x64/arm64 failures on the full build don't look related:

 /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error : Unknown file format.
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error :    at System.Reflection.PortableExecutable.PEHeaders..ctor(Stream peStream, Int32 size, Boolean isLoadedImage)
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error :    at System.Reflection.PortableExecutable.PEReader.InitializePEHeaders()
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error :    at Microsoft.DotNet.SignTool.VerifySignatures.IsSignedPE(String filePath) in /_/src/arcade/src/Microsoft.DotNet.SignTool/src/VerifySignatures.cs:line 192
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error :    at Microsoft.DotNet.SignTool.Configuration.ExtractSignInfo(PathWithHash file, PathWithHash parentContainer, String collisionPriorityId, String wixContentFilePath) in /_/src/arcade/src/Microsoft.DotNet.SignTool/src/Configuration.cs:line 451
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error :    at Microsoft.DotNet.SignTool.Configuration.TrackFile(PathWithHash file, PathWithHash parentContainer, String collisionPriorityId) in /_/src/arcade/src/Microsoft.DotNet.SignTool/src/Configuration.cs:line 217
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error :    at Microsoft.DotNet.SignTool.Configuration.TryBuildZipData(FileSignInfo zipFileSignInfo, ZipData& zipData, String alternativeArchivePath) in /_/src/arcade/src/Microsoft.DotNet.SignTool/src/Configuration.cs:line 845
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error : Failed to build zip data for /Users/runner/work/1/s/src/runtime/artifacts/packages/Release/Shipping/dotnet-runtime-10.0.0-ci-osx-x64.tar.gz
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error MSB4018: The "Microsoft.DotNet.SignTool.SignToolTask" task failed unexpectedly.
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error MSB4018: System.Collections.Generic.KeyNotFoundException: The given key 'Microsoft.DotNet.SignTool.SignedFileContentKey' was not present in the dictionary.
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error MSB4018:    at System.Collections.Generic.Dictionary`2.get_Item(TKey key)
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error MSB4018:    at Microsoft.DotNet.SignTool.Configuration.TrackFile(PathWithHash file, PathWithHash parentContainer, String collisionPriorityId) in /_/src/arcade/src/Microsoft.DotNet.SignTool/src/Configuration.cs:line 272
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error MSB4018:    at Microsoft.DotNet.SignTool.Configuration.GenerateListOfFiles() in /_/src/arcade/src/Microsoft.DotNet.SignTool/src/Configuration.cs:line 172
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error MSB4018:    at Microsoft.DotNet.SignTool.SignToolTask.ExecuteImpl() in /_/src/arcade/src/Microsoft.DotNet.SignTool/src/SignToolTask.cs:line 285
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error MSB4018:    at Microsoft.DotNet.SignTool.SignToolTask.Execute() in /_/src/arcade/src/Microsoft.DotNet.SignTool/src/SignToolTask.cs:line 189
  /Users/runner/work/1/s/artifacts/source-built-sdks/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj(76,5): error MSB4018:    at Microsoft.Build.BackEnd.TaskBuilder.ExecuteInstantiatedTask(TaskExecutionHost taskExecutionHost, TaskLoggingContext taskLoggingContext, TaskHost taskHost, ItemBucket bucket, TaskExecutionMode howToExecuteTask)

@akoeplinger akoeplinger enabled auto-merge (squash) November 10, 2025 09:16
@akoeplinger akoeplinger merged commit 978fc84 into main Nov 10, 2025
71 of 74 checks passed
@akoeplinger akoeplinger deleted the jkoritzinsky-patch-1 branch November 10, 2025 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@akoeplinger akoeplinger akoeplinger approved these changes

@kotlarmilos kotlarmilos kotlarmilos approved these changes

Assignees

No one assigned

Labels

None yet

Projects

.NET Unified Build
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jkoritzinsky @akoeplinger @kotlarmilos