Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms - #126652

Merged
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests
Apr 9, 2026
Merged

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms#126652
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests

Conversation

CopilotAI commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

TypeLoadException: Could not load type 'System.Runtime.InteropServices.Swift.SwiftSelf' from assembly 'System.Private.CoreLib' on tvos_arm64 CoreCLR. The Swift interop types (SwiftSelf, SwiftError, SwiftIndirectResult) were being trimmed from System.Private.CoreLib.dll by ILLink on Apple builds.

The CreateRuntimeRootILLinkDescriptorFile task generates the ILLink root descriptor by processing corelib.h with DefineConstants="$(DefineConstants);FOR_ILLINK". Since corelib.h gates the Swift type definitions behind #ifdef TARGET_APPLE, and TARGET_APPLE was absent from the C# DefineConstants, the task didn't emit preservation roots for these types. ILLink then trimmed them as unreachable, causing CoreLibBinder::GetClass(CLASS__SWIFT_SELF) to throw at runtime.

Fixes#126557

CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:21
@github-actionsgithub-actionsBot added the area-Tools-ILVerification Issues related to ilverify tool and IL verification in general label Apr 8, 2026
CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:45
CopilotAI changed the title [WIP] Fix TypeLoadException in Verify_Clone_Hash on tvos_arm64Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platformsApr 8, 2026
CopilotAI requested a review from jkotasApril 8, 2026 18:46
@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas marked this pull request as ready for review April 8, 2026 21:12
CopilotAI review requested due to automatic review settings April 8, 2026 21:12
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas requested a review from vitek-karasApril 8, 2026 21:13
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotasjkotas added area-System.Runtime.InteropServices and removed area-Tools-ILVerification Issues related to ilverify tool and IL verification in general labels Apr 8, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

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 fixes Apple (tvOS arm64) CoreCLR runtime failures caused by ILLink trimming Swift interop types from System.Private.CoreLib by ensuring TARGET_APPLE is present in the CoreLib MSBuild DefineConstants used to generate the runtime ILLink root descriptor.

Changes:

  • Add TARGET_APPLE to DefineConstants when IsApplePlatform is true so corelib.h#ifdef TARGET_APPLE blocks are included during descriptor generation.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Copilot Code Review — PR #126652

Note

This review was generated by GitHub Copilot.

Holistic Assessment

Motivation: Justified and well-traced regression fix. PR #125083 added #ifdef TARGET_APPLE guards around Swift interop types in corelib.h, but the corresponding TARGET_APPLE C# DefineConstants was never added. The CreateRuntimeRootILLinkDescriptorFile task (which uses DefineConstants to parse corelib.h) therefore stopped emitting preservation roots for SwiftSelf, SwiftError, and SwiftIndirectResult, causing ILLink to trim them on Apple builds.

Approach: Correct and minimal. Adding TARGET_APPLE to DefineConstants conditioned on IsApplePlatform follows the established pattern of sibling defines (TARGET_OSX, TARGET_IOS, TARGET_TVOS, etc.) in the same <PropertyGroup>. The IsApplePlatform property (defined on line 15 of the same file) correctly covers macOS, MacCatalyst, iOS, and tvOS — matching the semantics of TARGET_APPLE as used in corelib.h.

Summary: ✅ LGTM. Single-line MSBuild fix that restores the missing TARGET_APPLE define, enabling the ILLink descriptor generator to preserve Swift interop types on Apple platforms. No side effects — there are currently zero #if TARGET_APPLE guards in CoreLib C# source, so the only effect is on the ILLink descriptor task's processing of corelib.h. Already approved by @jkoritzinsky.


Detailed Findings

✅ Correctness — Fix addresses root cause

Verified the regression chain: corelib.h:878-883 gates Swift types behind #ifdef TARGET_APPLECreateRuntimeRootILLinkDescriptorFile.targets:46 passes DefineConstants to the task → without TARGET_APPLE in DefineConstants, task skips those types → ILLink trims them → TypeLoadException at runtime. The fix directly addresses the gap.

✅ Platform coverage — IsApplePlatform is complete

IsApplePlatform (line 15) = TargetsOSXIsiOSLike, where IsiOSLike (line 14) = TargetsMacCatalystTargetsiOSTargetstvOS. This covers all Apple platforms that the C/C++ side recognizes as TARGET_APPLE.

✅ Placement — Consistent with existing pattern

The new define is correctly positioned before the more-specific platform defines (TARGET_OSX, TARGET_MACCATALYST, etc.), following the general → specific ordering used throughout this <PropertyGroup>.

✅ Side effects — None

No C# source files in System.Private.CoreLib/src/ currently use #if TARGET_APPLE. The define only affects the ILLink descriptor generation task. (Several files use the more specific TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS pattern, which could be consolidated to TARGET_APPLE in a follow-up, but that's out of scope.)

Generated by Code Review for issue #126652 ·

kg
kg approved these changes Apr 9, 2026
@jkotas

Copy link
Copy Markdown
Member

/ba-g other runtime-extra-platforms failures are being worked on

@jkotas
jkotas merged commit 295ecbd into mainApr 9, 2026
159 of 218 checks passed
@jkotas
jkotas deleted the copilot/fix-type-load-exception-incremental-hash-tests branch April 9, 2026 01:43
This was referenced Apr 9, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 9, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TypeLoadException in Verify_Clone_Hash (IncrementalHashTests) on tvos_arm64 - missing SwiftSelf

6 participants

@jkotas@kg@jkoritzinsky@AaronRobinsonMSFT
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms - #126652

Merged
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests
Apr 9, 2026
Merged

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms#126652
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests

Conversation

CopilotAI commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

TypeLoadException: Could not load type 'System.Runtime.InteropServices.Swift.SwiftSelf' from assembly 'System.Private.CoreLib' on tvos_arm64 CoreCLR. The Swift interop types (SwiftSelf, SwiftError, SwiftIndirectResult) were being trimmed from System.Private.CoreLib.dll by ILLink on Apple builds.

The CreateRuntimeRootILLinkDescriptorFile task generates the ILLink root descriptor by processing corelib.h with DefineConstants="$(DefineConstants);FOR_ILLINK". Since corelib.h gates the Swift type definitions behind #ifdef TARGET_APPLE, and TARGET_APPLE was absent from the C# DefineConstants, the task didn't emit preservation roots for these types. ILLink then trimmed them as unreachable, causing CoreLibBinder::GetClass(CLASS__SWIFT_SELF) to throw at runtime.

Fixes#126557

CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:21
@github-actionsgithub-actionsBot added the area-Tools-ILVerification Issues related to ilverify tool and IL verification in general label Apr 8, 2026
CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:45
CopilotAI changed the title [WIP] Fix TypeLoadException in Verify_Clone_Hash on tvos_arm64Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platformsApr 8, 2026
CopilotAI requested a review from jkotasApril 8, 2026 18:46
@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas marked this pull request as ready for review April 8, 2026 21:12
CopilotAI review requested due to automatic review settings April 8, 2026 21:12
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas requested a review from vitek-karasApril 8, 2026 21:13
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotasjkotas added area-System.Runtime.InteropServices and removed area-Tools-ILVerification Issues related to ilverify tool and IL verification in general labels Apr 8, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

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 fixes Apple (tvOS arm64) CoreCLR runtime failures caused by ILLink trimming Swift interop types from System.Private.CoreLib by ensuring TARGET_APPLE is present in the CoreLib MSBuild DefineConstants used to generate the runtime ILLink root descriptor.

Changes:

  • Add TARGET_APPLE to DefineConstants when IsApplePlatform is true so corelib.h#ifdef TARGET_APPLE blocks are included during descriptor generation.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Copilot Code Review — PR #126652

Note

This review was generated by GitHub Copilot.

Holistic Assessment

Motivation: Justified and well-traced regression fix. PR #125083 added #ifdef TARGET_APPLE guards around Swift interop types in corelib.h, but the corresponding TARGET_APPLE C# DefineConstants was never added. The CreateRuntimeRootILLinkDescriptorFile task (which uses DefineConstants to parse corelib.h) therefore stopped emitting preservation roots for SwiftSelf, SwiftError, and SwiftIndirectResult, causing ILLink to trim them on Apple builds.

Approach: Correct and minimal. Adding TARGET_APPLE to DefineConstants conditioned on IsApplePlatform follows the established pattern of sibling defines (TARGET_OSX, TARGET_IOS, TARGET_TVOS, etc.) in the same <PropertyGroup>. The IsApplePlatform property (defined on line 15 of the same file) correctly covers macOS, MacCatalyst, iOS, and tvOS — matching the semantics of TARGET_APPLE as used in corelib.h.

Summary: ✅ LGTM. Single-line MSBuild fix that restores the missing TARGET_APPLE define, enabling the ILLink descriptor generator to preserve Swift interop types on Apple platforms. No side effects — there are currently zero #if TARGET_APPLE guards in CoreLib C# source, so the only effect is on the ILLink descriptor task's processing of corelib.h. Already approved by @jkoritzinsky.


Detailed Findings

✅ Correctness — Fix addresses root cause

Verified the regression chain: corelib.h:878-883 gates Swift types behind #ifdef TARGET_APPLECreateRuntimeRootILLinkDescriptorFile.targets:46 passes DefineConstants to the task → without TARGET_APPLE in DefineConstants, task skips those types → ILLink trims them → TypeLoadException at runtime. The fix directly addresses the gap.

✅ Platform coverage — IsApplePlatform is complete

IsApplePlatform (line 15) = TargetsOSXIsiOSLike, where IsiOSLike (line 14) = TargetsMacCatalystTargetsiOSTargetstvOS. This covers all Apple platforms that the C/C++ side recognizes as TARGET_APPLE.

✅ Placement — Consistent with existing pattern

The new define is correctly positioned before the more-specific platform defines (TARGET_OSX, TARGET_MACCATALYST, etc.), following the general → specific ordering used throughout this <PropertyGroup>.

✅ Side effects — None

No C# source files in System.Private.CoreLib/src/ currently use #if TARGET_APPLE. The define only affects the ILLink descriptor generation task. (Several files use the more specific TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS pattern, which could be consolidated to TARGET_APPLE in a follow-up, but that's out of scope.)

Generated by Code Review for issue #126652 ·

kg
kg approved these changes Apr 9, 2026
@jkotas

Copy link
Copy Markdown
Member

/ba-g other runtime-extra-platforms failures are being worked on

@jkotas
jkotas merged commit 295ecbd into mainApr 9, 2026
159 of 218 checks passed
@jkotas
jkotas deleted the copilot/fix-type-load-exception-incremental-hash-tests branch April 9, 2026 01:43
This was referenced Apr 9, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 9, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TypeLoadException in Verify_Clone_Hash (IncrementalHashTests) on tvos_arm64 - missing SwiftSelf

6 participants

@jkotas@kg@jkoritzinsky@AaronRobinsonMSFT
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms - #126652

Merged
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests
Apr 9, 2026
Merged

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms#126652
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests

Conversation

CopilotAI commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

TypeLoadException: Could not load type 'System.Runtime.InteropServices.Swift.SwiftSelf' from assembly 'System.Private.CoreLib' on tvos_arm64 CoreCLR. The Swift interop types (SwiftSelf, SwiftError, SwiftIndirectResult) were being trimmed from System.Private.CoreLib.dll by ILLink on Apple builds.

The CreateRuntimeRootILLinkDescriptorFile task generates the ILLink root descriptor by processing corelib.h with DefineConstants="$(DefineConstants);FOR_ILLINK". Since corelib.h gates the Swift type definitions behind #ifdef TARGET_APPLE, and TARGET_APPLE was absent from the C# DefineConstants, the task didn't emit preservation roots for these types. ILLink then trimmed them as unreachable, causing CoreLibBinder::GetClass(CLASS__SWIFT_SELF) to throw at runtime.

Fixes#126557

CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:21
@github-actionsgithub-actionsBot added the area-Tools-ILVerification Issues related to ilverify tool and IL verification in general label Apr 8, 2026
CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:45
CopilotAI changed the title [WIP] Fix TypeLoadException in Verify_Clone_Hash on tvos_arm64Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platformsApr 8, 2026
CopilotAI requested a review from jkotasApril 8, 2026 18:46
@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas marked this pull request as ready for review April 8, 2026 21:12
CopilotAI review requested due to automatic review settings April 8, 2026 21:12
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas requested a review from vitek-karasApril 8, 2026 21:13
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotasjkotas added area-System.Runtime.InteropServices and removed area-Tools-ILVerification Issues related to ilverify tool and IL verification in general labels Apr 8, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

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 fixes Apple (tvOS arm64) CoreCLR runtime failures caused by ILLink trimming Swift interop types from System.Private.CoreLib by ensuring TARGET_APPLE is present in the CoreLib MSBuild DefineConstants used to generate the runtime ILLink root descriptor.

Changes:

  • Add TARGET_APPLE to DefineConstants when IsApplePlatform is true so corelib.h#ifdef TARGET_APPLE blocks are included during descriptor generation.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Copilot Code Review — PR #126652

Note

This review was generated by GitHub Copilot.

Holistic Assessment

Motivation: Justified and well-traced regression fix. PR #125083 added #ifdef TARGET_APPLE guards around Swift interop types in corelib.h, but the corresponding TARGET_APPLE C# DefineConstants was never added. The CreateRuntimeRootILLinkDescriptorFile task (which uses DefineConstants to parse corelib.h) therefore stopped emitting preservation roots for SwiftSelf, SwiftError, and SwiftIndirectResult, causing ILLink to trim them on Apple builds.

Approach: Correct and minimal. Adding TARGET_APPLE to DefineConstants conditioned on IsApplePlatform follows the established pattern of sibling defines (TARGET_OSX, TARGET_IOS, TARGET_TVOS, etc.) in the same <PropertyGroup>. The IsApplePlatform property (defined on line 15 of the same file) correctly covers macOS, MacCatalyst, iOS, and tvOS — matching the semantics of TARGET_APPLE as used in corelib.h.

Summary: ✅ LGTM. Single-line MSBuild fix that restores the missing TARGET_APPLE define, enabling the ILLink descriptor generator to preserve Swift interop types on Apple platforms. No side effects — there are currently zero #if TARGET_APPLE guards in CoreLib C# source, so the only effect is on the ILLink descriptor task's processing of corelib.h. Already approved by @jkoritzinsky.


Detailed Findings

✅ Correctness — Fix addresses root cause

Verified the regression chain: corelib.h:878-883 gates Swift types behind #ifdef TARGET_APPLECreateRuntimeRootILLinkDescriptorFile.targets:46 passes DefineConstants to the task → without TARGET_APPLE in DefineConstants, task skips those types → ILLink trims them → TypeLoadException at runtime. The fix directly addresses the gap.

✅ Platform coverage — IsApplePlatform is complete

IsApplePlatform (line 15) = TargetsOSXIsiOSLike, where IsiOSLike (line 14) = TargetsMacCatalystTargetsiOSTargetstvOS. This covers all Apple platforms that the C/C++ side recognizes as TARGET_APPLE.

✅ Placement — Consistent with existing pattern

The new define is correctly positioned before the more-specific platform defines (TARGET_OSX, TARGET_MACCATALYST, etc.), following the general → specific ordering used throughout this <PropertyGroup>.

✅ Side effects — None

No C# source files in System.Private.CoreLib/src/ currently use #if TARGET_APPLE. The define only affects the ILLink descriptor generation task. (Several files use the more specific TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS pattern, which could be consolidated to TARGET_APPLE in a follow-up, but that's out of scope.)

Generated by Code Review for issue #126652 ·

kg
kg approved these changes Apr 9, 2026
@jkotas

Copy link
Copy Markdown
Member

/ba-g other runtime-extra-platforms failures are being worked on

@jkotas
jkotas merged commit 295ecbd into mainApr 9, 2026
159 of 218 checks passed
@jkotas
jkotas deleted the copilot/fix-type-load-exception-incremental-hash-tests branch April 9, 2026 01:43
This was referenced Apr 9, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 9, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TypeLoadException in Verify_Clone_Hash (IncrementalHashTests) on tvos_arm64 - missing SwiftSelf

6 participants

@jkotas@kg@jkoritzinsky@AaronRobinsonMSFT
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms - #126652

Merged
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests
Apr 9, 2026
Merged

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms#126652
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests

Conversation

CopilotAI commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

TypeLoadException: Could not load type 'System.Runtime.InteropServices.Swift.SwiftSelf' from assembly 'System.Private.CoreLib' on tvos_arm64 CoreCLR. The Swift interop types (SwiftSelf, SwiftError, SwiftIndirectResult) were being trimmed from System.Private.CoreLib.dll by ILLink on Apple builds.

The CreateRuntimeRootILLinkDescriptorFile task generates the ILLink root descriptor by processing corelib.h with DefineConstants="$(DefineConstants);FOR_ILLINK". Since corelib.h gates the Swift type definitions behind #ifdef TARGET_APPLE, and TARGET_APPLE was absent from the C# DefineConstants, the task didn't emit preservation roots for these types. ILLink then trimmed them as unreachable, causing CoreLibBinder::GetClass(CLASS__SWIFT_SELF) to throw at runtime.

Fixes#126557

CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:21
@github-actionsgithub-actionsBot added the area-Tools-ILVerification Issues related to ilverify tool and IL verification in general label Apr 8, 2026
CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:45
CopilotAI changed the title [WIP] Fix TypeLoadException in Verify_Clone_Hash on tvos_arm64Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platformsApr 8, 2026
CopilotAI requested a review from jkotasApril 8, 2026 18:46
@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas marked this pull request as ready for review April 8, 2026 21:12
CopilotAI review requested due to automatic review settings April 8, 2026 21:12
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas requested a review from vitek-karasApril 8, 2026 21:13
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotasjkotas added area-System.Runtime.InteropServices and removed area-Tools-ILVerification Issues related to ilverify tool and IL verification in general labels Apr 8, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

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 fixes Apple (tvOS arm64) CoreCLR runtime failures caused by ILLink trimming Swift interop types from System.Private.CoreLib by ensuring TARGET_APPLE is present in the CoreLib MSBuild DefineConstants used to generate the runtime ILLink root descriptor.

Changes:

  • Add TARGET_APPLE to DefineConstants when IsApplePlatform is true so corelib.h#ifdef TARGET_APPLE blocks are included during descriptor generation.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Copilot Code Review — PR #126652

Note

This review was generated by GitHub Copilot.

Holistic Assessment

Motivation: Justified and well-traced regression fix. PR #125083 added #ifdef TARGET_APPLE guards around Swift interop types in corelib.h, but the corresponding TARGET_APPLE C# DefineConstants was never added. The CreateRuntimeRootILLinkDescriptorFile task (which uses DefineConstants to parse corelib.h) therefore stopped emitting preservation roots for SwiftSelf, SwiftError, and SwiftIndirectResult, causing ILLink to trim them on Apple builds.

Approach: Correct and minimal. Adding TARGET_APPLE to DefineConstants conditioned on IsApplePlatform follows the established pattern of sibling defines (TARGET_OSX, TARGET_IOS, TARGET_TVOS, etc.) in the same <PropertyGroup>. The IsApplePlatform property (defined on line 15 of the same file) correctly covers macOS, MacCatalyst, iOS, and tvOS — matching the semantics of TARGET_APPLE as used in corelib.h.

Summary: ✅ LGTM. Single-line MSBuild fix that restores the missing TARGET_APPLE define, enabling the ILLink descriptor generator to preserve Swift interop types on Apple platforms. No side effects — there are currently zero #if TARGET_APPLE guards in CoreLib C# source, so the only effect is on the ILLink descriptor task's processing of corelib.h. Already approved by @jkoritzinsky.


Detailed Findings

✅ Correctness — Fix addresses root cause

Verified the regression chain: corelib.h:878-883 gates Swift types behind #ifdef TARGET_APPLECreateRuntimeRootILLinkDescriptorFile.targets:46 passes DefineConstants to the task → without TARGET_APPLE in DefineConstants, task skips those types → ILLink trims them → TypeLoadException at runtime. The fix directly addresses the gap.

✅ Platform coverage — IsApplePlatform is complete

IsApplePlatform (line 15) = TargetsOSXIsiOSLike, where IsiOSLike (line 14) = TargetsMacCatalystTargetsiOSTargetstvOS. This covers all Apple platforms that the C/C++ side recognizes as TARGET_APPLE.

✅ Placement — Consistent with existing pattern

The new define is correctly positioned before the more-specific platform defines (TARGET_OSX, TARGET_MACCATALYST, etc.), following the general → specific ordering used throughout this <PropertyGroup>.

✅ Side effects — None

No C# source files in System.Private.CoreLib/src/ currently use #if TARGET_APPLE. The define only affects the ILLink descriptor generation task. (Several files use the more specific TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS pattern, which could be consolidated to TARGET_APPLE in a follow-up, but that's out of scope.)

Generated by Code Review for issue #126652 ·

kg
kg approved these changes Apr 9, 2026
@jkotas

Copy link
Copy Markdown
Member

/ba-g other runtime-extra-platforms failures are being worked on

@jkotas
jkotas merged commit 295ecbd into mainApr 9, 2026
159 of 218 checks passed
@jkotas
jkotas deleted the copilot/fix-type-load-exception-incremental-hash-tests branch April 9, 2026 01:43
This was referenced Apr 9, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 9, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TypeLoadException in Verify_Clone_Hash (IncrementalHashTests) on tvos_arm64 - missing SwiftSelf

6 participants

@jkotas@kg@jkoritzinsky@AaronRobinsonMSFT
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms - #126652

Merged
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests
Apr 9, 2026
Merged

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms#126652
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests

Conversation

CopilotAI commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

TypeLoadException: Could not load type 'System.Runtime.InteropServices.Swift.SwiftSelf' from assembly 'System.Private.CoreLib' on tvos_arm64 CoreCLR. The Swift interop types (SwiftSelf, SwiftError, SwiftIndirectResult) were being trimmed from System.Private.CoreLib.dll by ILLink on Apple builds.

The CreateRuntimeRootILLinkDescriptorFile task generates the ILLink root descriptor by processing corelib.h with DefineConstants="$(DefineConstants);FOR_ILLINK". Since corelib.h gates the Swift type definitions behind #ifdef TARGET_APPLE, and TARGET_APPLE was absent from the C# DefineConstants, the task didn't emit preservation roots for these types. ILLink then trimmed them as unreachable, causing CoreLibBinder::GetClass(CLASS__SWIFT_SELF) to throw at runtime.

Fixes#126557

CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:21
@github-actionsgithub-actionsBot added the area-Tools-ILVerification Issues related to ilverify tool and IL verification in general label Apr 8, 2026
CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:45
CopilotAI changed the title [WIP] Fix TypeLoadException in Verify_Clone_Hash on tvos_arm64Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platformsApr 8, 2026
CopilotAI requested a review from jkotasApril 8, 2026 18:46
@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas marked this pull request as ready for review April 8, 2026 21:12
CopilotAI review requested due to automatic review settings April 8, 2026 21:12
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas requested a review from vitek-karasApril 8, 2026 21:13
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotasjkotas added area-System.Runtime.InteropServices and removed area-Tools-ILVerification Issues related to ilverify tool and IL verification in general labels Apr 8, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

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 fixes Apple (tvOS arm64) CoreCLR runtime failures caused by ILLink trimming Swift interop types from System.Private.CoreLib by ensuring TARGET_APPLE is present in the CoreLib MSBuild DefineConstants used to generate the runtime ILLink root descriptor.

Changes:

  • Add TARGET_APPLE to DefineConstants when IsApplePlatform is true so corelib.h#ifdef TARGET_APPLE blocks are included during descriptor generation.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Copilot Code Review — PR #126652

Note

This review was generated by GitHub Copilot.

Holistic Assessment

Motivation: Justified and well-traced regression fix. PR #125083 added #ifdef TARGET_APPLE guards around Swift interop types in corelib.h, but the corresponding TARGET_APPLE C# DefineConstants was never added. The CreateRuntimeRootILLinkDescriptorFile task (which uses DefineConstants to parse corelib.h) therefore stopped emitting preservation roots for SwiftSelf, SwiftError, and SwiftIndirectResult, causing ILLink to trim them on Apple builds.

Approach: Correct and minimal. Adding TARGET_APPLE to DefineConstants conditioned on IsApplePlatform follows the established pattern of sibling defines (TARGET_OSX, TARGET_IOS, TARGET_TVOS, etc.) in the same <PropertyGroup>. The IsApplePlatform property (defined on line 15 of the same file) correctly covers macOS, MacCatalyst, iOS, and tvOS — matching the semantics of TARGET_APPLE as used in corelib.h.

Summary: ✅ LGTM. Single-line MSBuild fix that restores the missing TARGET_APPLE define, enabling the ILLink descriptor generator to preserve Swift interop types on Apple platforms. No side effects — there are currently zero #if TARGET_APPLE guards in CoreLib C# source, so the only effect is on the ILLink descriptor task's processing of corelib.h. Already approved by @jkoritzinsky.


Detailed Findings

✅ Correctness — Fix addresses root cause

Verified the regression chain: corelib.h:878-883 gates Swift types behind #ifdef TARGET_APPLECreateRuntimeRootILLinkDescriptorFile.targets:46 passes DefineConstants to the task → without TARGET_APPLE in DefineConstants, task skips those types → ILLink trims them → TypeLoadException at runtime. The fix directly addresses the gap.

✅ Platform coverage — IsApplePlatform is complete

IsApplePlatform (line 15) = TargetsOSXIsiOSLike, where IsiOSLike (line 14) = TargetsMacCatalystTargetsiOSTargetstvOS. This covers all Apple platforms that the C/C++ side recognizes as TARGET_APPLE.

✅ Placement — Consistent with existing pattern

The new define is correctly positioned before the more-specific platform defines (TARGET_OSX, TARGET_MACCATALYST, etc.), following the general → specific ordering used throughout this <PropertyGroup>.

✅ Side effects — None

No C# source files in System.Private.CoreLib/src/ currently use #if TARGET_APPLE. The define only affects the ILLink descriptor generation task. (Several files use the more specific TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS pattern, which could be consolidated to TARGET_APPLE in a follow-up, but that's out of scope.)

Generated by Code Review for issue #126652 ·

kg
kg approved these changes Apr 9, 2026
@jkotas

Copy link
Copy Markdown
Member

/ba-g other runtime-extra-platforms failures are being worked on

@jkotas
jkotas merged commit 295ecbd into mainApr 9, 2026
159 of 218 checks passed
@jkotas
jkotas deleted the copilot/fix-type-load-exception-incremental-hash-tests branch April 9, 2026 01:43
This was referenced Apr 9, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 9, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TypeLoadException in Verify_Clone_Hash (IncrementalHashTests) on tvos_arm64 - missing SwiftSelf

6 participants

@jkotas@kg@jkoritzinsky@AaronRobinsonMSFT
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms - #126652

Merged
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests
Apr 9, 2026
Merged

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms#126652
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests

Conversation

CopilotAI commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

TypeLoadException: Could not load type 'System.Runtime.InteropServices.Swift.SwiftSelf' from assembly 'System.Private.CoreLib' on tvos_arm64 CoreCLR. The Swift interop types (SwiftSelf, SwiftError, SwiftIndirectResult) were being trimmed from System.Private.CoreLib.dll by ILLink on Apple builds.

The CreateRuntimeRootILLinkDescriptorFile task generates the ILLink root descriptor by processing corelib.h with DefineConstants="$(DefineConstants);FOR_ILLINK". Since corelib.h gates the Swift type definitions behind #ifdef TARGET_APPLE, and TARGET_APPLE was absent from the C# DefineConstants, the task didn't emit preservation roots for these types. ILLink then trimmed them as unreachable, causing CoreLibBinder::GetClass(CLASS__SWIFT_SELF) to throw at runtime.

Fixes#126557

CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:21
@github-actionsgithub-actionsBot added the area-Tools-ILVerification Issues related to ilverify tool and IL verification in general label Apr 8, 2026
CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:45
CopilotAI changed the title [WIP] Fix TypeLoadException in Verify_Clone_Hash on tvos_arm64Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platformsApr 8, 2026
CopilotAI requested a review from jkotasApril 8, 2026 18:46
@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas marked this pull request as ready for review April 8, 2026 21:12
CopilotAI review requested due to automatic review settings April 8, 2026 21:12
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas requested a review from vitek-karasApril 8, 2026 21:13
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotasjkotas added area-System.Runtime.InteropServices and removed area-Tools-ILVerification Issues related to ilverify tool and IL verification in general labels Apr 8, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

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 fixes Apple (tvOS arm64) CoreCLR runtime failures caused by ILLink trimming Swift interop types from System.Private.CoreLib by ensuring TARGET_APPLE is present in the CoreLib MSBuild DefineConstants used to generate the runtime ILLink root descriptor.

Changes:

  • Add TARGET_APPLE to DefineConstants when IsApplePlatform is true so corelib.h#ifdef TARGET_APPLE blocks are included during descriptor generation.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Copilot Code Review — PR #126652

Note

This review was generated by GitHub Copilot.

Holistic Assessment

Motivation: Justified and well-traced regression fix. PR #125083 added #ifdef TARGET_APPLE guards around Swift interop types in corelib.h, but the corresponding TARGET_APPLE C# DefineConstants was never added. The CreateRuntimeRootILLinkDescriptorFile task (which uses DefineConstants to parse corelib.h) therefore stopped emitting preservation roots for SwiftSelf, SwiftError, and SwiftIndirectResult, causing ILLink to trim them on Apple builds.

Approach: Correct and minimal. Adding TARGET_APPLE to DefineConstants conditioned on IsApplePlatform follows the established pattern of sibling defines (TARGET_OSX, TARGET_IOS, TARGET_TVOS, etc.) in the same <PropertyGroup>. The IsApplePlatform property (defined on line 15 of the same file) correctly covers macOS, MacCatalyst, iOS, and tvOS — matching the semantics of TARGET_APPLE as used in corelib.h.

Summary: ✅ LGTM. Single-line MSBuild fix that restores the missing TARGET_APPLE define, enabling the ILLink descriptor generator to preserve Swift interop types on Apple platforms. No side effects — there are currently zero #if TARGET_APPLE guards in CoreLib C# source, so the only effect is on the ILLink descriptor task's processing of corelib.h. Already approved by @jkoritzinsky.


Detailed Findings

✅ Correctness — Fix addresses root cause

Verified the regression chain: corelib.h:878-883 gates Swift types behind #ifdef TARGET_APPLECreateRuntimeRootILLinkDescriptorFile.targets:46 passes DefineConstants to the task → without TARGET_APPLE in DefineConstants, task skips those types → ILLink trims them → TypeLoadException at runtime. The fix directly addresses the gap.

✅ Platform coverage — IsApplePlatform is complete

IsApplePlatform (line 15) = TargetsOSXIsiOSLike, where IsiOSLike (line 14) = TargetsMacCatalystTargetsiOSTargetstvOS. This covers all Apple platforms that the C/C++ side recognizes as TARGET_APPLE.

✅ Placement — Consistent with existing pattern

The new define is correctly positioned before the more-specific platform defines (TARGET_OSX, TARGET_MACCATALYST, etc.), following the general → specific ordering used throughout this <PropertyGroup>.

✅ Side effects — None

No C# source files in System.Private.CoreLib/src/ currently use #if TARGET_APPLE. The define only affects the ILLink descriptor generation task. (Several files use the more specific TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS pattern, which could be consolidated to TARGET_APPLE in a follow-up, but that's out of scope.)

Generated by Code Review for issue #126652 ·

kg
kg approved these changes Apr 9, 2026
@jkotas

Copy link
Copy Markdown
Member

/ba-g other runtime-extra-platforms failures are being worked on

@jkotas
jkotas merged commit 295ecbd into mainApr 9, 2026
159 of 218 checks passed
@jkotas
jkotas deleted the copilot/fix-type-load-exception-incremental-hash-tests branch April 9, 2026 01:43
This was referenced Apr 9, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 9, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TypeLoadException in Verify_Clone_Hash (IncrementalHashTests) on tvos_arm64 - missing SwiftSelf

6 participants

@jkotas@kg@jkoritzinsky@AaronRobinsonMSFT
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms - #126652

Merged
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests
Apr 9, 2026
Merged

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms#126652
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests

Conversation

CopilotAI commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

TypeLoadException: Could not load type 'System.Runtime.InteropServices.Swift.SwiftSelf' from assembly 'System.Private.CoreLib' on tvos_arm64 CoreCLR. The Swift interop types (SwiftSelf, SwiftError, SwiftIndirectResult) were being trimmed from System.Private.CoreLib.dll by ILLink on Apple builds.

The CreateRuntimeRootILLinkDescriptorFile task generates the ILLink root descriptor by processing corelib.h with DefineConstants="$(DefineConstants);FOR_ILLINK". Since corelib.h gates the Swift type definitions behind #ifdef TARGET_APPLE, and TARGET_APPLE was absent from the C# DefineConstants, the task didn't emit preservation roots for these types. ILLink then trimmed them as unreachable, causing CoreLibBinder::GetClass(CLASS__SWIFT_SELF) to throw at runtime.

Fixes#126557

CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:21
@github-actionsgithub-actionsBot added the area-Tools-ILVerification Issues related to ilverify tool and IL verification in general label Apr 8, 2026
CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:45
CopilotAI changed the title [WIP] Fix TypeLoadException in Verify_Clone_Hash on tvos_arm64Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platformsApr 8, 2026
CopilotAI requested a review from jkotasApril 8, 2026 18:46
@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas marked this pull request as ready for review April 8, 2026 21:12
CopilotAI review requested due to automatic review settings April 8, 2026 21:12
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas requested a review from vitek-karasApril 8, 2026 21:13
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotasjkotas added area-System.Runtime.InteropServices and removed area-Tools-ILVerification Issues related to ilverify tool and IL verification in general labels Apr 8, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

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 fixes Apple (tvOS arm64) CoreCLR runtime failures caused by ILLink trimming Swift interop types from System.Private.CoreLib by ensuring TARGET_APPLE is present in the CoreLib MSBuild DefineConstants used to generate the runtime ILLink root descriptor.

Changes:

  • Add TARGET_APPLE to DefineConstants when IsApplePlatform is true so corelib.h#ifdef TARGET_APPLE blocks are included during descriptor generation.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Copilot Code Review — PR #126652

Note

This review was generated by GitHub Copilot.

Holistic Assessment

Motivation: Justified and well-traced regression fix. PR #125083 added #ifdef TARGET_APPLE guards around Swift interop types in corelib.h, but the corresponding TARGET_APPLE C# DefineConstants was never added. The CreateRuntimeRootILLinkDescriptorFile task (which uses DefineConstants to parse corelib.h) therefore stopped emitting preservation roots for SwiftSelf, SwiftError, and SwiftIndirectResult, causing ILLink to trim them on Apple builds.

Approach: Correct and minimal. Adding TARGET_APPLE to DefineConstants conditioned on IsApplePlatform follows the established pattern of sibling defines (TARGET_OSX, TARGET_IOS, TARGET_TVOS, etc.) in the same <PropertyGroup>. The IsApplePlatform property (defined on line 15 of the same file) correctly covers macOS, MacCatalyst, iOS, and tvOS — matching the semantics of TARGET_APPLE as used in corelib.h.

Summary: ✅ LGTM. Single-line MSBuild fix that restores the missing TARGET_APPLE define, enabling the ILLink descriptor generator to preserve Swift interop types on Apple platforms. No side effects — there are currently zero #if TARGET_APPLE guards in CoreLib C# source, so the only effect is on the ILLink descriptor task's processing of corelib.h. Already approved by @jkoritzinsky.


Detailed Findings

✅ Correctness — Fix addresses root cause

Verified the regression chain: corelib.h:878-883 gates Swift types behind #ifdef TARGET_APPLECreateRuntimeRootILLinkDescriptorFile.targets:46 passes DefineConstants to the task → without TARGET_APPLE in DefineConstants, task skips those types → ILLink trims them → TypeLoadException at runtime. The fix directly addresses the gap.

✅ Platform coverage — IsApplePlatform is complete

IsApplePlatform (line 15) = TargetsOSXIsiOSLike, where IsiOSLike (line 14) = TargetsMacCatalystTargetsiOSTargetstvOS. This covers all Apple platforms that the C/C++ side recognizes as TARGET_APPLE.

✅ Placement — Consistent with existing pattern

The new define is correctly positioned before the more-specific platform defines (TARGET_OSX, TARGET_MACCATALYST, etc.), following the general → specific ordering used throughout this <PropertyGroup>.

✅ Side effects — None

No C# source files in System.Private.CoreLib/src/ currently use #if TARGET_APPLE. The define only affects the ILLink descriptor generation task. (Several files use the more specific TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS pattern, which could be consolidated to TARGET_APPLE in a follow-up, but that's out of scope.)

Generated by Code Review for issue #126652 ·

kg
kg approved these changes Apr 9, 2026
@jkotas

Copy link
Copy Markdown
Member

/ba-g other runtime-extra-platforms failures are being worked on

@jkotas
jkotas merged commit 295ecbd into mainApr 9, 2026
159 of 218 checks passed
@jkotas
jkotas deleted the copilot/fix-type-load-exception-incremental-hash-tests branch April 9, 2026 01:43
This was referenced Apr 9, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 9, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TypeLoadException in Verify_Clone_Hash (IncrementalHashTests) on tvos_arm64 - missing SwiftSelf

6 participants

@jkotas@kg@jkoritzinsky@AaronRobinsonMSFT
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms - #126652

Merged
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests
Apr 9, 2026
Merged

Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platforms#126652
jkotas merged 3 commits into
mainfrom
copilot/fix-type-load-exception-incremental-hash-tests

Conversation

CopilotAI commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

TypeLoadException: Could not load type 'System.Runtime.InteropServices.Swift.SwiftSelf' from assembly 'System.Private.CoreLib' on tvos_arm64 CoreCLR. The Swift interop types (SwiftSelf, SwiftError, SwiftIndirectResult) were being trimmed from System.Private.CoreLib.dll by ILLink on Apple builds.

The CreateRuntimeRootILLinkDescriptorFile task generates the ILLink root descriptor by processing corelib.h with DefineConstants="$(DefineConstants);FOR_ILLINK". Since corelib.h gates the Swift type definitions behind #ifdef TARGET_APPLE, and TARGET_APPLE was absent from the C# DefineConstants, the task didn't emit preservation roots for these types. ILLink then trimmed them as unreachable, causing CoreLibBinder::GetClass(CLASS__SWIFT_SELF) to throw at runtime.

Fixes#126557

CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:21
@github-actionsgithub-actionsBot added the area-Tools-ILVerification Issues related to ilverify tool and IL verification in general label Apr 8, 2026
CopilotAI requested review from Copilot and removed request for CopilotApril 8, 2026 18:45
CopilotAI changed the title [WIP] Fix TypeLoadException in Verify_Clone_Hash on tvos_arm64Add TARGET_APPLE to System.Private.CoreLib DefineConstants for Apple platformsApr 8, 2026
CopilotAI requested a review from jkotasApril 8, 2026 18:46
@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas marked this pull request as ready for review April 8, 2026 21:12
CopilotAI review requested due to automatic review settings April 8, 2026 21:12
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotas

Copy link
Copy Markdown
Member

/azp run runtime-extra-platforms

@jkotas
jkotas requested a review from vitek-karasApril 8, 2026 21:13
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@jkotasjkotas added area-System.Runtime.InteropServices and removed area-Tools-ILVerification Issues related to ilverify tool and IL verification in general labels Apr 8, 2026
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

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 fixes Apple (tvOS arm64) CoreCLR runtime failures caused by ILLink trimming Swift interop types from System.Private.CoreLib by ensuring TARGET_APPLE is present in the CoreLib MSBuild DefineConstants used to generate the runtime ILLink root descriptor.

Changes:

  • Add TARGET_APPLE to DefineConstants when IsApplePlatform is true so corelib.h#ifdef TARGET_APPLE blocks are included during descriptor generation.

@github-actions

Copy link
Copy Markdown
Contributor

🤖 Copilot Code Review — PR #126652

Note

This review was generated by GitHub Copilot.

Holistic Assessment

Motivation: Justified and well-traced regression fix. PR #125083 added #ifdef TARGET_APPLE guards around Swift interop types in corelib.h, but the corresponding TARGET_APPLE C# DefineConstants was never added. The CreateRuntimeRootILLinkDescriptorFile task (which uses DefineConstants to parse corelib.h) therefore stopped emitting preservation roots for SwiftSelf, SwiftError, and SwiftIndirectResult, causing ILLink to trim them on Apple builds.

Approach: Correct and minimal. Adding TARGET_APPLE to DefineConstants conditioned on IsApplePlatform follows the established pattern of sibling defines (TARGET_OSX, TARGET_IOS, TARGET_TVOS, etc.) in the same <PropertyGroup>. The IsApplePlatform property (defined on line 15 of the same file) correctly covers macOS, MacCatalyst, iOS, and tvOS — matching the semantics of TARGET_APPLE as used in corelib.h.

Summary: ✅ LGTM. Single-line MSBuild fix that restores the missing TARGET_APPLE define, enabling the ILLink descriptor generator to preserve Swift interop types on Apple platforms. No side effects — there are currently zero #if TARGET_APPLE guards in CoreLib C# source, so the only effect is on the ILLink descriptor task's processing of corelib.h. Already approved by @jkoritzinsky.


Detailed Findings

✅ Correctness — Fix addresses root cause

Verified the regression chain: corelib.h:878-883 gates Swift types behind #ifdef TARGET_APPLECreateRuntimeRootILLinkDescriptorFile.targets:46 passes DefineConstants to the task → without TARGET_APPLE in DefineConstants, task skips those types → ILLink trims them → TypeLoadException at runtime. The fix directly addresses the gap.

✅ Platform coverage — IsApplePlatform is complete

IsApplePlatform (line 15) = TargetsOSXIsiOSLike, where IsiOSLike (line 14) = TargetsMacCatalystTargetsiOSTargetstvOS. This covers all Apple platforms that the C/C++ side recognizes as TARGET_APPLE.

✅ Placement — Consistent with existing pattern

The new define is correctly positioned before the more-specific platform defines (TARGET_OSX, TARGET_MACCATALYST, etc.), following the general → specific ordering used throughout this <PropertyGroup>.

✅ Side effects — None

No C# source files in System.Private.CoreLib/src/ currently use #if TARGET_APPLE. The define only affects the ILLink descriptor generation task. (Several files use the more specific TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS pattern, which could be consolidated to TARGET_APPLE in a follow-up, but that's out of scope.)

Generated by Code Review for issue #126652 ·

kg
kg approved these changes Apr 9, 2026
@jkotas

Copy link
Copy Markdown
Member

/ba-g other runtime-extra-platforms failures are being worked on

@jkotas
jkotas merged commit 295ecbd into mainApr 9, 2026
159 of 218 checks passed
@jkotas
jkotas deleted the copilot/fix-type-load-exception-incremental-hash-tests branch April 9, 2026 01:43
This was referenced Apr 9, 2026
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 9, 2026
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TypeLoadException in Verify_Clone_Hash (IncrementalHashTests) on tvos_arm64 - missing SwiftSelf

6 participants

@jkotas@kg@jkoritzinsky@AaronRobinsonMSFT