Preserve IL for CoreCLR interpreter fallback on Apple mobile#130622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

kotlarmilos merged 22 commits into main from copilot/clr-ios-track-il-stripping-issues

Jul 28, 2026

+181 −53

src/coreclr/tools/Common/InstructionSetHelpers.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ @@
 using Internal.TypeSystem;
 using InstructionSet = Internal.JitInterface.InstructionSet;
+using InstructionSetFlags = Internal.JitInterface.InstructionSetFlags;
 namespace System.CommandLine
 {
@@ Expand DownExpand Up @@
  InstructionSetSupportBuilder.GetNonSpecifiableInstructionSetsForArch(targetArchitecture),
  targetArchitecture);
  }
+ // Produces an InstructionSetSupport where the instruction sets are fixed at compile time: every
+ // specifiable instruction set that is not already supported is marked explicitly unsupported, and the
+ // supported sets are also treated as optimistic. This is used for targets without runtime code generation
+ // (for example Apple mobile and WASM), where the pre-compiled code must hard code its ISA usage because
+ // there is no JIT to recover from an instruction set mismatch.
+ public static InstructionSetSupport GetFixedInstructionSetSupport(InstructionSetSupport instructionSetSupport)
+ {
+ InstructionSetFlags unsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags;
+ foreach (var instructionSetInfo in InstructionSetFlags.ArchitectureToValidInstructionSets(instructionSetSupport.Architecture))
+ {
+ if (instructionSetInfo.Specifiable &&
+ !instructionSetSupport.IsInstructionSetSupported(instructionSetInfo.InstructionSet))
+ {
+ unsupportedInstructionSets.AddInstructionSet(instructionSetInfo.InstructionSet);
+ }
+ }
+ unsupportedInstructionSets.ExpandInstructionSetByReverseImplication(instructionSetSupport.Architecture);
+ unsupportedInstructionSets.Set64BitInstructionSetVariants(instructionSetSupport.Architecture);
+ if (instructionSetSupport.Architecture is TargetArchitecture.X86 or TargetArchitecture.ARM)
+ unsupportedInstructionSets.Set64BitInstructionSetVariantsUnconditionally(instructionSetSupport.Architecture);
+ return new InstructionSetSupport(
+ instructionSetSupport.SupportedFlags,
+ unsupportedInstructionSets,
+ instructionSetSupport.SupportedFlags,
+ instructionSetSupport.NonSpecifiableFlags,
+ instructionSetSupport.Architecture);
+ }
  }
 }

src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs

-Original file line number
+Diff line change
@@ Expand Up @@
  new(nameof(RuntimeAsyncStripILBodiesPreservesTaskReturningIL), [new CrossgenAssembly(stripILBodies)])
  {
  Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies],
+ AdditionalArgs = ["--targetarch:x64"],
  Validate = Validate,
  },
  ]));
@@ Expand All / @@ -593,6 +594,7 @@ static void Validate(ReadyToRunReader reader) @@
  Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out diag), diag);
  Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "ComputeTag", out diag), diag);
  Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "Root", out diag), diag);
+ Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag);
  Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncTaskMethod", out diag), diag);
  Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncValueTaskMethod", out diag), diag);
@@ Expand All / @@ -604,6 +606,50 @@ static void Validate(ReadyToRunReader reader) @@
  }
  }
+ [Fact]
+ public void AppleMobileStripILBodiesUsesFixedInstructionSet()
+ {
+ var stripILBodies = new CompiledAssembly
+ {
+ AssemblyName = nameof(AppleMobileStripILBodiesUsesFixedInstructionSet),
+ SourceResourceNames =
+ [
+ "RuntimeAsync/StripILBodies.cs",
+ "RuntimeAsync/RuntimeAsyncMethodGenerationAttribute.cs",
+ ],
+ Features = { RuntimeAsyncFeature },
+ };
+ new R2RTestRunner(_output).Run(new R2RTestCase(
+ nameof(AppleMobileStripILBodiesUsesFixedInstructionSet),
+ [
+ new(nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [new CrossgenAssembly(stripILBodies)])
+ {
+ Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies],
+ AdditionalArgs = ["--targetos:ios", "--targetarch:arm64"],
+ Validate = Validate,
+ },
+ ]));
+ static void Validate(ReadyToRunReader reader)
+ {
+ string componentFile = Path.Combine(
+ Path.GetDirectoryName(reader.Filename)!,
+ nameof(AppleMobileStripILBodiesUsesFixedInstructionSet) + ".dll");
+ Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out string diag), diag);
+ Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag);
+ Assert.False(
+ R2RAssert.HasFixupKindOnMethod(
+ reader,
+ ReadyToRunFixupKind.Check_InstructionSetSupport,
+ ".UsesRuntimeCheckedInstructionSet(",
+ out diag),
+ diag);
+ Assert.True(R2RAssert.EagerInstructionSetSupportHasNoUnsupportedEntries(reader, out diag), diag);
+ }
+ }
  /// <summary>
  /// PR #123643: Async methods capturing GC refs across await points
  /// produce ContinuationLayout fixups encoding the GC ref map.
@@ Expand Down @@

src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,9 @@ @@
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using ArmAes = System.Runtime.Intrinsics.Arm.Aes;
+using X86Aes = System.Runtime.Intrinsics.X86.Aes;
 public static class StripILBodies
 {
  [MethodImpl(MethodImplOptions.NoInlining)]
@@ Expand DownExpand Up / @@ -82,6 +85,12 @@ public static int PlainStrippableMethod(int a, int b) @@
  return a + b + ComputeTag();
  }
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ public static bool UsesRuntimeCheckedInstructionSet()
+ {
+ return X86Aes.IsSupported || ArmAes.IsSupported || ArmAes.Arm64.IsSupported;
+ }
  [MethodImpl(MethodImplOptions.NoInlining)]
  private static int ComputeTag()
  {
@@ Expand Down @@

src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs

-Original file line number
+Diff line change
@@ Expand Up @@
  return true;
  }
+ /// <summary>
+ /// Returns true if the global eager baseline <see cref="ReadyToRunFixupKind.Check_InstructionSetSupport"/>
+ /// fixup does not assert that any instruction set must be absent at runtime ("must be absent" entries render
+ /// with a <c>-</c> suffix; supported entries use <c>+</c>). Targets that cannot generate code at runtime must
+ /// not encode these assertions, as a failing eager fixup fatally disables all ReadyToRun code with no JIT fallback.
+ /// </summary>
+ public static bool EagerInstructionSetSupportHasNoUnsupportedEntries(ReadyToRunReader reader, out string diagnostic)
+ {
+ var options = new SignatureFormattingOptions();
+ var signatures = new List<string>();
+ foreach (ReadyToRunImportSection section in reader.ImportSections)
+ {
+ if (section.Entries is null)
+ continue;
+ foreach (ReadyToRunImportSection.ImportSectionEntry entry in section.Entries)
+ {
+ if (entry.Signature is not null && entry.Signature.FixupKind == ReadyToRunFixupKind.Check_InstructionSetSupport)
+ signatures.Add(entry.Signature.ToString(options));
+ }
+ }
+ if (signatures.Count == 0)
+ {
+ diagnostic = "Expected a global Check_InstructionSetSupport eager fixup, but none was found.";
+ return false;
+ }
+ var withUnsupported = signatures.Where(s => s.Contains('-')).ToList();
+ if (withUnsupported.Count > 0)
+ {
+ diagnostic =
+ "Global Check_InstructionSetSupport fixup must not assert any instruction set is absent " +
+ $"on no-JIT targets, but found: [{string.Join(", ", withUnsupported)}]";
+ return false;
+ }
+ diagnostic = $"Global Check_InstructionSetSupport fixup asserts only supported instruction sets: [{string.Join(", ", signatures)}]";
+ return true;
+ }
  /// <summary>
  /// Returns true if the R2R image contains at least one fixup of the given kind.
  /// </summary>
@@ Expand Down @@

...yToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs

-Original file line number
+Diff line change
@@ Expand Up @@
  {
  string _instructionSetsSupport;
- public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport)
+ public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport, bool emitExplicitlyUnsupported = true)
  {
  StringBuilder builder = new StringBuilder();
  InstructionSet[] supportedInstructionSets = instructionSetSupport.SupportedFlags.ToArray();
  Array.Sort(supportedInstructionSets);
- InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray();
- Array.Sort(explicitlyUnsupportedInstructionSets);
  bool addDelimiter = false;
  var r2rAlreadyEmitted = new HashSet<ReadyToRunInstructionSet>();
@@ Expand All @@
  builder.Append(',');
  r2rAlreadyEmitted.Clear();
- addDelimiter = false;
- foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets)
+ if (emitExplicitlyUnsupported)
  {
- var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture);
- if (r2rInstructionSet == null)
- continue;
+ InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray();
+ Array.Sort(explicitlyUnsupportedInstructionSets);
- if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value))
+ addDelimiter = false;
+ foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets)
  {
- if (addDelimiter)
- builder.Append('-');
- addDelimiter = true;
- builder.Append(r2rInstructionSet.Value.ToString());
+ var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture);
+ if (r2rInstructionSet == null)
+ continue;
+ if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value))
+ {
+ if (addDelimiter)
+ builder.Append('-');
+ addDelimiter = true;
+ builder.Append(r2rInstructionSet.Value.ToString());
+ }
  }
  }
@@ Expand Down @@

src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -382,8 +382,11 @@ internal ReadyToRunCodegenCompilation( @@
  CompilationModuleGroup = (ReadyToRunCompilationModuleGroupBase)nodeFactory.CompilationModuleGroup;
  // Generate baseline support specification for InstructionSetSupport. This will prevent usage of the generated
- // code if the runtime environment doesn't support the specified instruction set
- string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport);
+ // code if the runtime environment doesn't support the specified instruction set. Targets that cannot generate
+ // code at runtime must not encode "must be absent" assertions, since a failing eager fixup is a fatal startup
+ // error with no JIT fallback (see ToInstructionSetSupportString).
+ bool targetAllowsRuntimeCodeGeneration = ((ReadyToRunCompilerContext)nodeFactory.TypeSystemContext).TargetAllowsRuntimeCodeGeneration;
+ string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport, emitExplicitlyUnsupported: targetAllowsRuntimeCodeGeneration);
  ReadyToRunInstructionSetSupportSignature instructionSetSupportSig = new ReadyToRunInstructionSetSupportSignature(instructionSetSupportString);
  _dependencyGraph.AddRoot(new Import(NodeFactory.EagerImports, instructionSetSupportSig), "Baseline instruction set support");
@@ Expand Down @@

src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -58,11 +58,13 @@ public ReadyToRunCompilerContext( @@
  TargetDetails details,
  SharedGenericsMode genericsMode,
  bool bubbleIncludesCoreModule,
+ bool targetAllowsRuntimeCodeGeneration,
  InstructionSetSupport instructionSetSupport,
  CompilerTypeSystemContext oldTypeSystemContext)
  : base(details, genericsMode)
  {
  BubbleIncludesCoreModule = bubbleIncludesCoreModule;
+ TargetAllowsRuntimeCodeGeneration = targetAllowsRuntimeCodeGeneration;
  InstructionSetSupport = instructionSetSupport;
  _r2rFieldLayoutAlgorithm = new ReadyToRunMetadataFieldLayoutAlgorithm();
  _systemObjectFieldLayoutAlgorithm = new SystemObjectFieldLayoutAlgorithm(_r2rFieldLayoutAlgorithm);
@@ Expand DownExpand Up / @@ -99,27 +101,7 @@ public ReadyToRunCompilerContext( @@
  public InstructionSetSupport InstructionSetSupport { get; }
- public bool TargetAllowsRuntimeCodeGeneration
- {
- get
- {
-#if FEATURE_DYNAMIC_CODE_COMPILED
- if (Target.OperatingSystem is TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator)
- {
- return false;
- }
- if (Target.Architecture is TargetArchitecture.Wasm32)
- {
- return false;
- }
- return true;
-#else
- return false;
-#endif
- }
- }
+ public bool TargetAllowsRuntimeCodeGeneration { get; }
  public override FieldLayoutAlgorithm GetLayoutAlgorithmForType(DefType type)
  {
@@ Expand Down @@

src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
  <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants>
- <DefineConstants Condition="'$(FeatureDynamicCodeCompiled)' == 'true'">$(DefineConstants);FEATURE_DYNAMIC_CODE_COMPILED</DefineConstants>
  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  <Platforms>x64;x86;arm;arm64</Platforms>
  <PlatformTarget>AnyCPU</PlatformTarget>
@@ Expand Down @@

src/coreclr/tools/aot/crossgen2/Program.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -76,29 +76,34 @@ public int Run() @@
  var logger = new Logger(Console.Out, Get(_command.IsVerbose));
- // Crossgen2 is partial AOT and its pre-compiled methods can be
- // thrown away at runtime if they mismatch in required ISAs or
- // computed layouts of structs. Thus we want to ensure that usage
- // of Vector<T> is only optimistic and doesn't hard code a dependency
- // that would cause the entire image to be invalidated.
- bool isVectorTOptimistic = true;
  (TargetArchitecture targetArchitecture, TargetOS targetOS, TargetAbi targetAbi) =
  Helpers.GetTargetSpec(Get(_command.TargetArchitecture), Get(_command.TargetOS));
+ bool targetAllowsRuntimeCodeGeneration = GetTargetAllowsRuntimeCodeGeneration(targetOS, targetArchitecture);
+ // Crossgen2 is partial AOT and its pre-compiled methods can be thrown away at runtime if
+ // they mismatch in required ISAs or computed layouts of structs. On targets that allow
+ // runtime code generation we keep Vector<T> usage optimistic so we never hard code a
+ // dependency that could invalidate the entire image. On targets that do not allow
+ // runtime code generation, we do not want an ISA mismatch to invalidate any code
+ // in the image. There we make Vector<T> non-optimistic and hard code the ISA support
+ // to avoid falling back to the interpreter.
+ bool isVectorTOptimistic = targetAllowsRuntimeCodeGeneration;
  bool allowOptimistic = _command.OptimizationMode != OptimizationMode.PreferSize;
- if (targetOS is TargetOS.iOS or TargetOS.tvOS or TargetOS.iOSSimulator or TargetOS.tvOSSimulator or TargetOS.MacCatalyst or TargetOS.Browser or TargetOS.Wasi)
+ if (!targetAllowsRuntimeCodeGeneration)
  {
- // These platforms do not support jitted code, so we want to ensure that we don't
- // need to fall back to the interpreter for any hardware-intrinsic optimizations.
- // Disable optimistic instruction sets by default.
  allowOptimistic = false;
  }
  InstructionSetSupport instructionSetSupport = Helpers.ConfigureInstructionSetSupport(Get(_command.InstructionSet), Get(_command.MaxVectorTBitWidth), isVectorTOptimistic, targetArchitecture, targetOS,
  SR.InstructionSetMustNotBe, SR.InstructionSetInvalidImplication, logger,
  allowOptimistic: allowOptimistic,
  isReadyToRun: true);
+ if (!targetAllowsRuntimeCodeGeneration)
+ {
+ instructionSetSupport = Helpers.GetFixedInstructionSetSupport(instructionSetSupport);
+ }
  SharedGenericsMode genericsMode = SharedGenericsMode.CanonicalReferenceTypes;
  var targetDetails = new TargetDetails(targetArchitecture, targetOS, targetAbi, instructionSetSupport.GetVectorTSimdVector());
@@ Expand DownExpand Up / @@ -142,6 +147,7 @@ public int Run() @@
  // Initialize type system context
  //
  _typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, versionBubbleIncludesCoreLib,
+ targetAllowsRuntimeCodeGeneration,
  instructionSetSupport,
  oldTypeSystemContext: null);
@@ Expand DownExpand Up / @@ -286,6 +292,7 @@ public int Run() @@
  bool singleCompilationVersionBubbleIncludesCoreLib = versionBubbleIncludesCoreLib || (String.Compare(inputFile.Key, "System.Private.CoreLib", StringComparison.OrdinalIgnoreCase) == 0);
  typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, singleCompilationVersionBubbleIncludesCoreLib,
+ targetAllowsRuntimeCodeGeneration,
  _typeSystemContext.InstructionSetSupport,
  _typeSystemContext);
  typeSystemContext.InputFilePaths = singleCompilationInputFilePaths;
@@ Expand DownExpand Up @@
  }
  }
+ private static bool GetTargetAllowsRuntimeCodeGeneration(TargetOS operatingSystem, TargetArchitecture architecture)
+ {
+ return operatingSystem is not (TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator or TargetOS.Browser or TargetOS.Wasi)
+ && architecture is not TargetArchitecture.Wasm32;
+ }
  private void CheckManagedCppInputFiles(IEnumerable<string> inputPaths)
  {
  foreach (string inputFilePath in inputPaths)
@@ Expand Down @@

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 contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. dotnet /runtimePublic Notifications You must be signed in to change notification settings Fork 5.6k Star 18.2k Code Issues5k+ Pull requests563 Discussions Actions Projects Security and quality67 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights Preserve IL for CoreCLR interpreter fallback on Apple mobile#130622 New issue Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community. Sign up for GitHub By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails. Already on GitHub? Sign in to your account Merged kotlarmilos merged 22 commits into main from copilot/clr-ios-track-il-stripping-issuesJul 28, 2026 +181 −53 Conversation 98 Commits 22 Checks 193 Files changed 13 Merged Preserve IL for CoreCLR interpreter fallback on Apple mobile #130622 Show file tree Hide file tree Changes from all commits Commits Show all changes 22 commits Select commit Hold shift + click to select a range eacd9d2 Initial plan Copilot Jul 13, 2026f5f5cce Preserve IL for CoreCLR interpreter fallback Copilot Jul 13, 20267462331 Complete IL stripping validation Copilot Jul 13, 2026bbff0da Fix fixed ISA handling for stripped R2R images kotlarmilos Jul 14, 20267276e8a Merge main into IL stripping fixes kotlarmilos Jul 14, 20266f8d7a0 Potential fix for pull request finding kotlarmilos Jul 14, 202612d0b93 Potential fix for pull request finding kotlarmilos Jul 14, 20263b82391 Address fixed instruction set review feedback kotlarmilos Jul 15, 2026a4ce2cf Keep fixed ISA handling in crossgen2 kotlarmilos Jul 16, 20267729441 Restore existing CorInfo formatting kotlarmilos Jul 16, 2026ab2af53 Remove unrelated formatting changes kotlarmilos Jul 16, 2026027c501 Dedup fixed-instruction-set target check and relocate crossgen2 ISA h… kotlarmilos Jul 17, 2026c099887 Drop doc comment on IsFixedInstructionSetTarget for parity with surro… kotlarmilos Jul 17, 20268b8c810 Drop comment on GetFixedInstructionSetSupport for parity with surroun… kotlarmilos Jul 17, 20263309739 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 17, 20267d4fd8b Refactor crossgen2 fixed-instruction-set handling per review feedback kotlarmilos Jul 20, 20265c33a99 Fix Apple mobile ReadyToRun startup crash from baseline instruction-s… kotlarmilos Jul 20, 20264537bbc Drop explanatory comment on baseline signature unsupported-entry guard kotlarmilos Jul 20, 20269c231ea Move GetTargetAllowsRuntimeCodeGeneration into crossgen2 Program.cs kotlarmilos Jul 21, 2026c86b9e1 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 21, 2026fae3aeb Remove host-specific FEATURE_DYNAMIC_CODE_COMPILED gating from crossgen2 kotlarmilos Jul 22, 20267e1cc8d Remove dead FEATURE_DYNAMIC_CODE_COMPILED define from ILCompiler.Read… kotlarmilos Jul 22, 2026 File filter Filter by extension Filter by extension .cs (9) .csproj (4) All 2 file types selected Only manifest files Viewed files Clear filters Conversations Failed to load comments. Loading Uh oh! There was an error while loading. Please reload this page. Jump to Jump to file Failed to load files. Loading Uh oh! There was an error while loading. Please reload this page. Diff view Unified Split Hide whitespace Diff view Unified Split Hide whitespace src/coreclr/tools/Common/InstructionSetHelpers.cs InstructionSetHelpers.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs R2RTestSuites.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs StripILBodies.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs R2RResultChecker.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs ReadyToRunInstructionSetSupportSignature.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs ReadyToRunCodegenCompilation.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs ReadyToRunCompilerContext.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj ILCompiler.ReadyToRun.csproj src/coreclr/tools/aot/crossgen2/Program.cs Program.cs src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj System.IO.Hashing.Tests.csproj src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/SignatureDecoderTests.cs SignatureDecoderTests.cs src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj System.Reflection.Metadata.Tests.csproj src/tests/JIT/Regression/Regression_o_2.csproj Regression_o_2.csproj Some comments aren't visible on the classic Files Changed page. There are no files selected for viewing 31 changes: 31 additions & 0 deletions 31 src/coreclr/tools/Common/InstructionSetHelpers.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -11,6 +11,7 @@ using Internal.TypeSystem; using InstructionSet = Internal.JitInterface.InstructionSet; using InstructionSetFlags = Internal.JitInterface.InstructionSetFlags; namespace System.CommandLine { Expand DownExpand Up @@ -353,5 +354,35 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru InstructionSetSupportBuilder.GetNonSpecifiableInstructionSetsForArch(targetArchitecture), targetArchitecture); } // Produces an InstructionSetSupport where the instruction sets are fixed at compile time: every // specifiable instruction set that is not already supported is marked explicitly unsupported, and the // supported sets are also treated as optimistic. This is used for targets without runtime code generation // (for example Apple mobile and WASM), where the pre-compiled code must hard code its ISA usage because // there is no JIT to recover from an instruction set mismatch. public static InstructionSetSupport GetFixedInstructionSetSupport(InstructionSetSupport instructionSetSupport) Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. { InstructionSetFlags unsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags; foreach (var instructionSetInfo in InstructionSetFlags.ArchitectureToValidInstructionSets(instructionSetSupport.Architecture)) { if (instructionSetInfo.Specifiable && !instructionSetSupport.IsInstructionSetSupported(instructionSetInfo.InstructionSet)) { unsupportedInstructionSets.AddInstructionSet(instructionSetInfo.InstructionSet); } } unsupportedInstructionSets.ExpandInstructionSetByReverseImplication(instructionSetSupport.Architecture); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. unsupportedInstructionSets.Set64BitInstructionSetVariants(instructionSetSupport.Architecture); if (instructionSetSupport.Architecture is TargetArchitecture.X86 or TargetArchitecture.ARM) unsupportedInstructionSets.Set64BitInstructionSetVariantsUnconditionally(instructionSetSupport.Architecture); return new InstructionSetSupport( instructionSetSupport.SupportedFlags, unsupportedInstructionSets, instructionSetSupport.SupportedFlags, instructionSetSupport.NonSpecifiableFlags, instructionSetSupport.Architecture); } } } 46 changes: 46 additions & 0 deletions 46 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -570,6 +570,7 @@ public void RuntimeAsyncStripILBodiesPreservesTaskReturningIL() new(nameof(RuntimeAsyncStripILBodiesPreservesTaskReturningIL), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetarch:x64"], Validate = Validate, }, ])); Expand All @@ -593,6 +594,7 @@ static void Validate(ReadyToRunReader reader) Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "ComputeTag", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "Root", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncTaskMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncValueTaskMethod", out diag), diag); Expand All @@ -604,6 +606,50 @@ static void Validate(ReadyToRunReader reader) } } [Fact] public void AppleMobileStripILBodiesUsesFixedInstructionSet() { var stripILBodies = new CompiledAssembly { AssemblyName = nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), SourceResourceNames = [ "RuntimeAsync/StripILBodies.cs", "RuntimeAsync/RuntimeAsyncMethodGenerationAttribute.cs", ], Features = { RuntimeAsyncFeature }, }; new R2RTestRunner(_output).Run(new R2RTestCase( nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [ new(nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetos:ios", "--targetarch:arm64"], Validate = Validate, }, ])); static void Validate(ReadyToRunReader reader) { string componentFile = Path.Combine( Path.GetDirectoryName(reader.Filename)!, nameof(AppleMobileStripILBodiesUsesFixedInstructionSet) + ".dll"); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out string diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.False( R2RAssert.HasFixupKindOnMethod( reader, ReadyToRunFixupKind.Check_InstructionSetSupport, ".UsesRuntimeCheckedInstructionSet(", out diag), diag); Assert.True(R2RAssert.EagerInstructionSetSupportHasNoUnsupportedEntries(reader, out diag), diag); } } /// <summary> /// PR #123643: Async methods capturing GC refs across await points /// produce ContinuationLayout fixups encoding the GC ref map. Expand Down 9 changes: 9 additions & 0 deletions 9 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -8,6 +8,9 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; using ArmAes = System.Runtime.Intrinsics.Arm.Aes; using X86Aes = System.Runtime.Intrinsics.X86.Aes; public static class StripILBodies { [MethodImpl(MethodImplOptions.NoInlining)] Expand DownExpand Up @@ -82,6 +85,12 @@ public static int PlainStrippableMethod(int a, int b) return a + b + ComputeTag(); } [MethodImpl(MethodImplOptions.NoInlining)] public static bool UsesRuntimeCheckedInstructionSet() { return X86Aes.IsSupported || ArmAes.IsSupported || ArmAes.Arm64.IsSupported; } [MethodImpl(MethodImplOptions.NoInlining)] private static int ComputeTag() { Expand Down 41 changes: 41 additions & 0 deletions 41 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -954,6 +954,47 @@ public static bool HasFixupKindCountOnMethod(ReadyToRunReader reader, ReadyToRun return true; } /// <summary> /// Returns true if the global eager baseline <see cref="ReadyToRunFixupKind.Check_InstructionSetSupport"/> /// fixup does not assert that any instruction set must be absent at runtime ("must be absent" entries render /// with a <c>-</c> suffix; supported entries use <c>+</c>). Targets that cannot generate code at runtime must /// not encode these assertions, as a failing eager fixup fatally disables all ReadyToRun code with no JIT fallback. /// </summary> Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. public static bool EagerInstructionSetSupportHasNoUnsupportedEntries(ReadyToRunReader reader, out string diagnostic) { var options = new SignatureFormattingOptions(); var signatures = new List<string>(); foreach (ReadyToRunImportSection section in reader.ImportSections) { if (section.Entries is null) continue; Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. foreach (ReadyToRunImportSection.ImportSectionEntry entry in section.Entries) { if (entry.Signature is not null && entry.Signature.FixupKind == ReadyToRunFixupKind.Check_InstructionSetSupport) signatures.Add(entry.Signature.ToString(options)); } } if (signatures.Count == 0) { diagnostic = "Expected a global Check_InstructionSetSupport eager fixup, but none was found."; return false; } var withUnsupported = signatures.Where(s => s.Contains('-')).ToList(); if (withUnsupported.Count > 0) { diagnostic = "Global Check_InstructionSetSupport fixup must not assert any instruction set is absent " + $"on no-JIT targets, but found: [{string.Join(", ", withUnsupported)}]"; return false; } diagnostic = $"Global Check_InstructionSetSupport fixup asserts only supported instruction sets: [{string.Join(", ", signatures)}]"; return true; } /// <summary> /// Returns true if the R2R image contains at least one fixup of the given kind. /// </summary> Expand Down 30 changes: 17 additions & 13 deletions 30 ...yToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -15,13 +15,11 @@ public class ReadyToRunInstructionSetSupportSignature : Signature { string _instructionSetsSupport; public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport) public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport, bool emitExplicitlyUnsupported = true) { StringBuilder builder = new StringBuilder(); InstructionSet[] supportedInstructionSets = instructionSetSupport.SupportedFlags.ToArray(); Array.Sort(supportedInstructionSets); InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); bool addDelimiter = false; var r2rAlreadyEmitted = new HashSet<ReadyToRunInstructionSet>(); Expand All @@ -43,19 +41,25 @@ public static string ToInstructionSetSupportString(InstructionSetSupport instruc builder.Append(','); r2rAlreadyEmitted.Clear(); addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) if (emitExplicitlyUnsupported) { var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); } } } Expand Down 7 changes: 5 additions & 2 deletions 7 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -382,8 +382,11 @@ internal ReadyToRunCodegenCompilation( CompilationModuleGroup = (ReadyToRunCompilationModuleGroupBase)nodeFactory.CompilationModuleGroup; // Generate baseline support specification for InstructionSetSupport. This will prevent usage of the generated // code if the runtime environment doesn't support the specified instruction set string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport); // code if the runtime environment doesn't support the specified instruction set. Targets that cannot generate // code at runtime must not encode "must be absent" assertions, since a failing eager fixup is a fatal startup // error with no JIT fallback (see ToInstructionSetSupportString). Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. bool targetAllowsRuntimeCodeGeneration = ((ReadyToRunCompilerContext)nodeFactory.TypeSystemContext).TargetAllowsRuntimeCodeGeneration; string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport, emitExplicitlyUnsupported: targetAllowsRuntimeCodeGeneration); ReadyToRunInstructionSetSupportSignature instructionSetSupportSig = new ReadyToRunInstructionSetSupportSignature(instructionSetSupportString); _dependencyGraph.AddRoot(new Import(NodeFactory.EagerImports, instructionSetSupportSig), "Baseline instruction set support"); Expand Down 24 changes: 3 additions & 21 deletions 24 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -58,11 +58,13 @@ public ReadyToRunCompilerContext( TargetDetails details, SharedGenericsMode genericsMode, bool bubbleIncludesCoreModule, bool targetAllowsRuntimeCodeGeneration, InstructionSetSupport instructionSetSupport, CompilerTypeSystemContext oldTypeSystemContext) : base(details, genericsMode) { BubbleIncludesCoreModule = bubbleIncludesCoreModule; TargetAllowsRuntimeCodeGeneration = targetAllowsRuntimeCodeGeneration; InstructionSetSupport = instructionSetSupport; _r2rFieldLayoutAlgorithm = new ReadyToRunMetadataFieldLayoutAlgorithm(); _systemObjectFieldLayoutAlgorithm = new SystemObjectFieldLayoutAlgorithm(_r2rFieldLayoutAlgorithm); Expand DownExpand Up @@ -99,27 +101,7 @@ public ReadyToRunCompilerContext( public InstructionSetSupport InstructionSetSupport { get; } public bool TargetAllowsRuntimeCodeGeneration { get { #if FEATURE_DYNAMIC_CODE_COMPILED if (Target.OperatingSystem is TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator) { return false; } if (Target.Architecture is TargetArchitecture.Wasm32) { return false; } return true; #else return false; #endif } } public bool TargetAllowsRuntimeCodeGeneration { get; } public override FieldLayoutAlgorithm GetLayoutAlgorithmForType(DefType type) { Expand Down 1 change: 0 additions & 1 deletion 1 src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -5,7 +5,6 @@ <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants> <DefineConstants Condition="'$(FeatureDynamicCodeCompiled)' == 'true'">$(DefineConstants);FEATURE_DYNAMIC_CODE_COMPILED</DefineConstants> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Platforms>x64;x86;arm;arm64</Platforms> <PlatformTarget>AnyCPU</PlatformTarget> Expand Down 35 changes: 24 additions & 11 deletions 35 src/coreclr/tools/aot/crossgen2/Program.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -76,29 +76,34 @@ public int Run() var logger = new Logger(Console.Out, Get(_command.IsVerbose)); // Crossgen2 is partial AOT and its pre-compiled methods can be // thrown away at runtime if they mismatch in required ISAs or // computed layouts of structs. Thus we want to ensure that usage // of Vector<T> is only optimistic and doesn't hard code a dependency // that would cause the entire image to be invalidated. bool isVectorTOptimistic = true; (TargetArchitecture targetArchitecture, TargetOS targetOS, TargetAbi targetAbi) = Helpers.GetTargetSpec(Get(_command.TargetArchitecture), Get(_command.TargetOS)); bool targetAllowsRuntimeCodeGeneration = GetTargetAllowsRuntimeCodeGeneration(targetOS, targetArchitecture); // Crossgen2 is partial AOT and its pre-compiled methods can be thrown away at runtime if // they mismatch in required ISAs or computed layouts of structs. On targets that allow // runtime code generation we keep Vector<T> usage optimistic so we never hard code a // dependency that could invalidate the entire image. On targets that do not allow // runtime code generation, we do not want an ISA mismatch to invalidate any code // in the image. There we make Vector<T> non-optimistic and hard code the ISA support // to avoid falling back to the interpreter. bool isVectorTOptimistic = targetAllowsRuntimeCodeGeneration; bool allowOptimistic = _command.OptimizationMode != OptimizationMode.PreferSize; if (targetOS is TargetOS.iOS or TargetOS.tvOS or TargetOS.iOSSimulator or TargetOS.tvOSSimulator or TargetOS.MacCatalyst or TargetOS.Browser or TargetOS.Wasi) if (!targetAllowsRuntimeCodeGeneration) { // These platforms do not support jitted code, so we want to ensure that we don't // need to fall back to the interpreter for any hardware-intrinsic optimizations. // Disable optimistic instruction sets by default. allowOptimistic = false; } InstructionSetSupport instructionSetSupport = Helpers.ConfigureInstructionSetSupport(Get(_command.InstructionSet), Get(_command.MaxVectorTBitWidth), isVectorTOptimistic, targetArchitecture, targetOS, SR.InstructionSetMustNotBe, SR.InstructionSetInvalidImplication, logger, allowOptimistic: allowOptimistic, isReadyToRun: true); if (!targetAllowsRuntimeCodeGeneration) { instructionSetSupport = Helpers.GetFixedInstructionSetSupport(instructionSetSupport); } SharedGenericsMode genericsMode = SharedGenericsMode.CanonicalReferenceTypes; var targetDetails = new TargetDetails(targetArchitecture, targetOS, targetAbi, instructionSetSupport.GetVectorTSimdVector()); Expand DownExpand Up @@ -142,6 +147,7 @@ public int Run() // Initialize type system context // _typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, versionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, instructionSetSupport, oldTypeSystemContext: null); Expand DownExpand Up @@ -286,6 +292,7 @@ public int Run() bool singleCompilationVersionBubbleIncludesCoreLib = versionBubbleIncludesCoreLib || (String.Compare(inputFile.Key, "System.Private.CoreLib", StringComparison.OrdinalIgnoreCase) == 0); typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, singleCompilationVersionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, _typeSystemContext.InstructionSetSupport, _typeSystemContext); typeSystemContext.InputFilePaths = singleCompilationInputFilePaths; Expand DownExpand Up @@ -700,6 +707,12 @@ private void RunSingleCompilation(Dictionary<string, string> inFilePaths, Instru } } private static bool GetTargetAllowsRuntimeCodeGeneration(TargetOS operatingSystem, TargetArchitecture architecture) { return operatingSystem is not (TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator or TargetOS.Browser or TargetOS.Wasi) && architecture is not TargetArchitecture.Wasm32; } private void CheckManagedCppInputFiles(IEnumerable<string> inputPaths) { foreach (string inputFilePath in inputPaths) Expand Down Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later. Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , '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 contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. dotnet /runtimePublic Notifications You must be signed in to change notification settings Fork 5.6k Star 18.2k Code Issues5k+ Pull requests563 Discussions Actions Projects Security and quality67 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights Preserve IL for CoreCLR interpreter fallback on Apple mobile#130622 New issue Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community. Sign up for GitHub By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails. Already on GitHub? Sign in to your account Merged kotlarmilos merged 22 commits into main from copilot/clr-ios-track-il-stripping-issuesJul 28, 2026 +181 −53 Conversation 98 Commits 22 Checks 193 Files changed 13 Merged Preserve IL for CoreCLR interpreter fallback on Apple mobile #130622 Show file tree Hide file tree Changes from all commits Commits Show all changes 22 commits Select commit Hold shift + click to select a range eacd9d2 Initial plan Copilot Jul 13, 2026f5f5cce Preserve IL for CoreCLR interpreter fallback Copilot Jul 13, 20267462331 Complete IL stripping validation Copilot Jul 13, 2026bbff0da Fix fixed ISA handling for stripped R2R images kotlarmilos Jul 14, 20267276e8a Merge main into IL stripping fixes kotlarmilos Jul 14, 20266f8d7a0 Potential fix for pull request finding kotlarmilos Jul 14, 202612d0b93 Potential fix for pull request finding kotlarmilos Jul 14, 20263b82391 Address fixed instruction set review feedback kotlarmilos Jul 15, 2026a4ce2cf Keep fixed ISA handling in crossgen2 kotlarmilos Jul 16, 20267729441 Restore existing CorInfo formatting kotlarmilos Jul 16, 2026ab2af53 Remove unrelated formatting changes kotlarmilos Jul 16, 2026027c501 Dedup fixed-instruction-set target check and relocate crossgen2 ISA h… kotlarmilos Jul 17, 2026c099887 Drop doc comment on IsFixedInstructionSetTarget for parity with surro… kotlarmilos Jul 17, 20268b8c810 Drop comment on GetFixedInstructionSetSupport for parity with surroun… kotlarmilos Jul 17, 20263309739 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 17, 20267d4fd8b Refactor crossgen2 fixed-instruction-set handling per review feedback kotlarmilos Jul 20, 20265c33a99 Fix Apple mobile ReadyToRun startup crash from baseline instruction-s… kotlarmilos Jul 20, 20264537bbc Drop explanatory comment on baseline signature unsupported-entry guard kotlarmilos Jul 20, 20269c231ea Move GetTargetAllowsRuntimeCodeGeneration into crossgen2 Program.cs kotlarmilos Jul 21, 2026c86b9e1 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 21, 2026fae3aeb Remove host-specific FEATURE_DYNAMIC_CODE_COMPILED gating from crossgen2 kotlarmilos Jul 22, 20267e1cc8d Remove dead FEATURE_DYNAMIC_CODE_COMPILED define from ILCompiler.Read… kotlarmilos Jul 22, 2026 File filter Filter by extension Filter by extension .cs (9) .csproj (4) All 2 file types selected Only manifest files Viewed files Clear filters Conversations Failed to load comments. Loading Uh oh! There was an error while loading. Please reload this page. Jump to Jump to file Failed to load files. Loading Uh oh! There was an error while loading. Please reload this page. Diff view Unified Split Hide whitespace Diff view Unified Split Hide whitespace src/coreclr/tools/Common/InstructionSetHelpers.cs InstructionSetHelpers.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs R2RTestSuites.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs StripILBodies.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs R2RResultChecker.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs ReadyToRunInstructionSetSupportSignature.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs ReadyToRunCodegenCompilation.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs ReadyToRunCompilerContext.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj ILCompiler.ReadyToRun.csproj src/coreclr/tools/aot/crossgen2/Program.cs Program.cs src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj System.IO.Hashing.Tests.csproj src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/SignatureDecoderTests.cs SignatureDecoderTests.cs src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj System.Reflection.Metadata.Tests.csproj src/tests/JIT/Regression/Regression_o_2.csproj Regression_o_2.csproj Some comments aren't visible on the classic Files Changed page. There are no files selected for viewing 31 changes: 31 additions & 0 deletions 31 src/coreclr/tools/Common/InstructionSetHelpers.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -11,6 +11,7 @@ using Internal.TypeSystem; using InstructionSet = Internal.JitInterface.InstructionSet; using InstructionSetFlags = Internal.JitInterface.InstructionSetFlags; namespace System.CommandLine { Expand DownExpand Up @@ -353,5 +354,35 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru InstructionSetSupportBuilder.GetNonSpecifiableInstructionSetsForArch(targetArchitecture), targetArchitecture); } // Produces an InstructionSetSupport where the instruction sets are fixed at compile time: every // specifiable instruction set that is not already supported is marked explicitly unsupported, and the // supported sets are also treated as optimistic. This is used for targets without runtime code generation // (for example Apple mobile and WASM), where the pre-compiled code must hard code its ISA usage because // there is no JIT to recover from an instruction set mismatch. public static InstructionSetSupport GetFixedInstructionSetSupport(InstructionSetSupport instructionSetSupport) Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. { InstructionSetFlags unsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags; foreach (var instructionSetInfo in InstructionSetFlags.ArchitectureToValidInstructionSets(instructionSetSupport.Architecture)) { if (instructionSetInfo.Specifiable && !instructionSetSupport.IsInstructionSetSupported(instructionSetInfo.InstructionSet)) { unsupportedInstructionSets.AddInstructionSet(instructionSetInfo.InstructionSet); } } unsupportedInstructionSets.ExpandInstructionSetByReverseImplication(instructionSetSupport.Architecture); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. unsupportedInstructionSets.Set64BitInstructionSetVariants(instructionSetSupport.Architecture); if (instructionSetSupport.Architecture is TargetArchitecture.X86 or TargetArchitecture.ARM) unsupportedInstructionSets.Set64BitInstructionSetVariantsUnconditionally(instructionSetSupport.Architecture); return new InstructionSetSupport( instructionSetSupport.SupportedFlags, unsupportedInstructionSets, instructionSetSupport.SupportedFlags, instructionSetSupport.NonSpecifiableFlags, instructionSetSupport.Architecture); } } } 46 changes: 46 additions & 0 deletions 46 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -570,6 +570,7 @@ public void RuntimeAsyncStripILBodiesPreservesTaskReturningIL() new(nameof(RuntimeAsyncStripILBodiesPreservesTaskReturningIL), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetarch:x64"], Validate = Validate, }, ])); Expand All @@ -593,6 +594,7 @@ static void Validate(ReadyToRunReader reader) Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "ComputeTag", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "Root", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncTaskMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncValueTaskMethod", out diag), diag); Expand All @@ -604,6 +606,50 @@ static void Validate(ReadyToRunReader reader) } } [Fact] public void AppleMobileStripILBodiesUsesFixedInstructionSet() { var stripILBodies = new CompiledAssembly { AssemblyName = nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), SourceResourceNames = [ "RuntimeAsync/StripILBodies.cs", "RuntimeAsync/RuntimeAsyncMethodGenerationAttribute.cs", ], Features = { RuntimeAsyncFeature }, }; new R2RTestRunner(_output).Run(new R2RTestCase( nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [ new(nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetos:ios", "--targetarch:arm64"], Validate = Validate, }, ])); static void Validate(ReadyToRunReader reader) { string componentFile = Path.Combine( Path.GetDirectoryName(reader.Filename)!, nameof(AppleMobileStripILBodiesUsesFixedInstructionSet) + ".dll"); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out string diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.False( R2RAssert.HasFixupKindOnMethod( reader, ReadyToRunFixupKind.Check_InstructionSetSupport, ".UsesRuntimeCheckedInstructionSet(", out diag), diag); Assert.True(R2RAssert.EagerInstructionSetSupportHasNoUnsupportedEntries(reader, out diag), diag); } } /// <summary> /// PR #123643: Async methods capturing GC refs across await points /// produce ContinuationLayout fixups encoding the GC ref map. Expand Down 9 changes: 9 additions & 0 deletions 9 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -8,6 +8,9 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; using ArmAes = System.Runtime.Intrinsics.Arm.Aes; using X86Aes = System.Runtime.Intrinsics.X86.Aes; public static class StripILBodies { [MethodImpl(MethodImplOptions.NoInlining)] Expand DownExpand Up @@ -82,6 +85,12 @@ public static int PlainStrippableMethod(int a, int b) return a + b + ComputeTag(); } [MethodImpl(MethodImplOptions.NoInlining)] public static bool UsesRuntimeCheckedInstructionSet() { return X86Aes.IsSupported || ArmAes.IsSupported || ArmAes.Arm64.IsSupported; } [MethodImpl(MethodImplOptions.NoInlining)] private static int ComputeTag() { Expand Down 41 changes: 41 additions & 0 deletions 41 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -954,6 +954,47 @@ public static bool HasFixupKindCountOnMethod(ReadyToRunReader reader, ReadyToRun return true; } /// <summary> /// Returns true if the global eager baseline <see cref="ReadyToRunFixupKind.Check_InstructionSetSupport"/> /// fixup does not assert that any instruction set must be absent at runtime ("must be absent" entries render /// with a <c>-</c> suffix; supported entries use <c>+</c>). Targets that cannot generate code at runtime must /// not encode these assertions, as a failing eager fixup fatally disables all ReadyToRun code with no JIT fallback. /// </summary> Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. public static bool EagerInstructionSetSupportHasNoUnsupportedEntries(ReadyToRunReader reader, out string diagnostic) { var options = new SignatureFormattingOptions(); var signatures = new List<string>(); foreach (ReadyToRunImportSection section in reader.ImportSections) { if (section.Entries is null) continue; Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. foreach (ReadyToRunImportSection.ImportSectionEntry entry in section.Entries) { if (entry.Signature is not null && entry.Signature.FixupKind == ReadyToRunFixupKind.Check_InstructionSetSupport) signatures.Add(entry.Signature.ToString(options)); } } if (signatures.Count == 0) { diagnostic = "Expected a global Check_InstructionSetSupport eager fixup, but none was found."; return false; } var withUnsupported = signatures.Where(s => s.Contains('-')).ToList(); if (withUnsupported.Count > 0) { diagnostic = "Global Check_InstructionSetSupport fixup must not assert any instruction set is absent " + $"on no-JIT targets, but found: [{string.Join(", ", withUnsupported)}]"; return false; } diagnostic = $"Global Check_InstructionSetSupport fixup asserts only supported instruction sets: [{string.Join(", ", signatures)}]"; return true; } /// <summary> /// Returns true if the R2R image contains at least one fixup of the given kind. /// </summary> Expand Down 30 changes: 17 additions & 13 deletions 30 ...yToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -15,13 +15,11 @@ public class ReadyToRunInstructionSetSupportSignature : Signature { string _instructionSetsSupport; public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport) public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport, bool emitExplicitlyUnsupported = true) { StringBuilder builder = new StringBuilder(); InstructionSet[] supportedInstructionSets = instructionSetSupport.SupportedFlags.ToArray(); Array.Sort(supportedInstructionSets); InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); bool addDelimiter = false; var r2rAlreadyEmitted = new HashSet<ReadyToRunInstructionSet>(); Expand All @@ -43,19 +41,25 @@ public static string ToInstructionSetSupportString(InstructionSetSupport instruc builder.Append(','); r2rAlreadyEmitted.Clear(); addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) if (emitExplicitlyUnsupported) { var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); } } } Expand Down 7 changes: 5 additions & 2 deletions 7 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -382,8 +382,11 @@ internal ReadyToRunCodegenCompilation( CompilationModuleGroup = (ReadyToRunCompilationModuleGroupBase)nodeFactory.CompilationModuleGroup; // Generate baseline support specification for InstructionSetSupport. This will prevent usage of the generated // code if the runtime environment doesn't support the specified instruction set string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport); // code if the runtime environment doesn't support the specified instruction set. Targets that cannot generate // code at runtime must not encode "must be absent" assertions, since a failing eager fixup is a fatal startup // error with no JIT fallback (see ToInstructionSetSupportString). Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. bool targetAllowsRuntimeCodeGeneration = ((ReadyToRunCompilerContext)nodeFactory.TypeSystemContext).TargetAllowsRuntimeCodeGeneration; string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport, emitExplicitlyUnsupported: targetAllowsRuntimeCodeGeneration); ReadyToRunInstructionSetSupportSignature instructionSetSupportSig = new ReadyToRunInstructionSetSupportSignature(instructionSetSupportString); _dependencyGraph.AddRoot(new Import(NodeFactory.EagerImports, instructionSetSupportSig), "Baseline instruction set support"); Expand Down 24 changes: 3 additions & 21 deletions 24 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -58,11 +58,13 @@ public ReadyToRunCompilerContext( TargetDetails details, SharedGenericsMode genericsMode, bool bubbleIncludesCoreModule, bool targetAllowsRuntimeCodeGeneration, InstructionSetSupport instructionSetSupport, CompilerTypeSystemContext oldTypeSystemContext) : base(details, genericsMode) { BubbleIncludesCoreModule = bubbleIncludesCoreModule; TargetAllowsRuntimeCodeGeneration = targetAllowsRuntimeCodeGeneration; InstructionSetSupport = instructionSetSupport; _r2rFieldLayoutAlgorithm = new ReadyToRunMetadataFieldLayoutAlgorithm(); _systemObjectFieldLayoutAlgorithm = new SystemObjectFieldLayoutAlgorithm(_r2rFieldLayoutAlgorithm); Expand DownExpand Up @@ -99,27 +101,7 @@ public ReadyToRunCompilerContext( public InstructionSetSupport InstructionSetSupport { get; } public bool TargetAllowsRuntimeCodeGeneration { get { #if FEATURE_DYNAMIC_CODE_COMPILED if (Target.OperatingSystem is TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator) { return false; } if (Target.Architecture is TargetArchitecture.Wasm32) { return false; } return true; #else return false; #endif } } public bool TargetAllowsRuntimeCodeGeneration { get; } public override FieldLayoutAlgorithm GetLayoutAlgorithmForType(DefType type) { Expand Down 1 change: 0 additions & 1 deletion 1 src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -5,7 +5,6 @@ <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants> <DefineConstants Condition="'$(FeatureDynamicCodeCompiled)' == 'true'">$(DefineConstants);FEATURE_DYNAMIC_CODE_COMPILED</DefineConstants> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Platforms>x64;x86;arm;arm64</Platforms> <PlatformTarget>AnyCPU</PlatformTarget> Expand Down 35 changes: 24 additions & 11 deletions 35 src/coreclr/tools/aot/crossgen2/Program.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -76,29 +76,34 @@ public int Run() var logger = new Logger(Console.Out, Get(_command.IsVerbose)); // Crossgen2 is partial AOT and its pre-compiled methods can be // thrown away at runtime if they mismatch in required ISAs or // computed layouts of structs. Thus we want to ensure that usage // of Vector<T> is only optimistic and doesn't hard code a dependency // that would cause the entire image to be invalidated. bool isVectorTOptimistic = true; (TargetArchitecture targetArchitecture, TargetOS targetOS, TargetAbi targetAbi) = Helpers.GetTargetSpec(Get(_command.TargetArchitecture), Get(_command.TargetOS)); bool targetAllowsRuntimeCodeGeneration = GetTargetAllowsRuntimeCodeGeneration(targetOS, targetArchitecture); // Crossgen2 is partial AOT and its pre-compiled methods can be thrown away at runtime if // they mismatch in required ISAs or computed layouts of structs. On targets that allow // runtime code generation we keep Vector<T> usage optimistic so we never hard code a // dependency that could invalidate the entire image. On targets that do not allow // runtime code generation, we do not want an ISA mismatch to invalidate any code // in the image. There we make Vector<T> non-optimistic and hard code the ISA support // to avoid falling back to the interpreter. bool isVectorTOptimistic = targetAllowsRuntimeCodeGeneration; bool allowOptimistic = _command.OptimizationMode != OptimizationMode.PreferSize; if (targetOS is TargetOS.iOS or TargetOS.tvOS or TargetOS.iOSSimulator or TargetOS.tvOSSimulator or TargetOS.MacCatalyst or TargetOS.Browser or TargetOS.Wasi) if (!targetAllowsRuntimeCodeGeneration) { // These platforms do not support jitted code, so we want to ensure that we don't // need to fall back to the interpreter for any hardware-intrinsic optimizations. // Disable optimistic instruction sets by default. allowOptimistic = false; } InstructionSetSupport instructionSetSupport = Helpers.ConfigureInstructionSetSupport(Get(_command.InstructionSet), Get(_command.MaxVectorTBitWidth), isVectorTOptimistic, targetArchitecture, targetOS, SR.InstructionSetMustNotBe, SR.InstructionSetInvalidImplication, logger, allowOptimistic: allowOptimistic, isReadyToRun: true); if (!targetAllowsRuntimeCodeGeneration) { instructionSetSupport = Helpers.GetFixedInstructionSetSupport(instructionSetSupport); } SharedGenericsMode genericsMode = SharedGenericsMode.CanonicalReferenceTypes; var targetDetails = new TargetDetails(targetArchitecture, targetOS, targetAbi, instructionSetSupport.GetVectorTSimdVector()); Expand DownExpand Up @@ -142,6 +147,7 @@ public int Run() // Initialize type system context // _typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, versionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, instructionSetSupport, oldTypeSystemContext: null); Expand DownExpand Up @@ -286,6 +292,7 @@ public int Run() bool singleCompilationVersionBubbleIncludesCoreLib = versionBubbleIncludesCoreLib || (String.Compare(inputFile.Key, "System.Private.CoreLib", StringComparison.OrdinalIgnoreCase) == 0); typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, singleCompilationVersionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, _typeSystemContext.InstructionSetSupport, _typeSystemContext); typeSystemContext.InputFilePaths = singleCompilationInputFilePaths; Expand DownExpand Up @@ -700,6 +707,12 @@ private void RunSingleCompilation(Dictionary<string, string> inFilePaths, Instru } } private static bool GetTargetAllowsRuntimeCodeGeneration(TargetOS operatingSystem, TargetArchitecture architecture) { return operatingSystem is not (TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator or TargetOS.Browser or TargetOS.Wasi) && architecture is not TargetArchitecture.Wasm32; } private void CheckManagedCppInputFiles(IEnumerable<string> inputPaths) { foreach (string inputFilePath in inputPaths) Expand Down Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later. Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , '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 > 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 contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. dotnet /runtimePublic Notifications You must be signed in to change notification settings Fork 5.6k Star 18.2k Code Issues5k+ Pull requests563 Discussions Actions Projects Security and quality67 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights Preserve IL for CoreCLR interpreter fallback on Apple mobile#130622 New issue Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community. Sign up for GitHub By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails. Already on GitHub? Sign in to your account Merged kotlarmilos merged 22 commits into main from copilot/clr-ios-track-il-stripping-issuesJul 28, 2026 +181 −53 Conversation 98 Commits 22 Checks 193 Files changed 13 Merged Preserve IL for CoreCLR interpreter fallback on Apple mobile #130622 Show file tree Hide file tree Changes from all commits Commits Show all changes 22 commits Select commit Hold shift + click to select a range eacd9d2 Initial plan Copilot Jul 13, 2026f5f5cce Preserve IL for CoreCLR interpreter fallback Copilot Jul 13, 20267462331 Complete IL stripping validation Copilot Jul 13, 2026bbff0da Fix fixed ISA handling for stripped R2R images kotlarmilos Jul 14, 20267276e8a Merge main into IL stripping fixes kotlarmilos Jul 14, 20266f8d7a0 Potential fix for pull request finding kotlarmilos Jul 14, 202612d0b93 Potential fix for pull request finding kotlarmilos Jul 14, 20263b82391 Address fixed instruction set review feedback kotlarmilos Jul 15, 2026a4ce2cf Keep fixed ISA handling in crossgen2 kotlarmilos Jul 16, 20267729441 Restore existing CorInfo formatting kotlarmilos Jul 16, 2026ab2af53 Remove unrelated formatting changes kotlarmilos Jul 16, 2026027c501 Dedup fixed-instruction-set target check and relocate crossgen2 ISA h… kotlarmilos Jul 17, 2026c099887 Drop doc comment on IsFixedInstructionSetTarget for parity with surro… kotlarmilos Jul 17, 20268b8c810 Drop comment on GetFixedInstructionSetSupport for parity with surroun… kotlarmilos Jul 17, 20263309739 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 17, 20267d4fd8b Refactor crossgen2 fixed-instruction-set handling per review feedback kotlarmilos Jul 20, 20265c33a99 Fix Apple mobile ReadyToRun startup crash from baseline instruction-s… kotlarmilos Jul 20, 20264537bbc Drop explanatory comment on baseline signature unsupported-entry guard kotlarmilos Jul 20, 20269c231ea Move GetTargetAllowsRuntimeCodeGeneration into crossgen2 Program.cs kotlarmilos Jul 21, 2026c86b9e1 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 21, 2026fae3aeb Remove host-specific FEATURE_DYNAMIC_CODE_COMPILED gating from crossgen2 kotlarmilos Jul 22, 20267e1cc8d Remove dead FEATURE_DYNAMIC_CODE_COMPILED define from ILCompiler.Read… kotlarmilos Jul 22, 2026 File filter Filter by extension Filter by extension .cs (9) .csproj (4) All 2 file types selected Only manifest files Viewed files Clear filters Conversations Failed to load comments. Loading Uh oh! There was an error while loading. Please reload this page. Jump to Jump to file Failed to load files. Loading Uh oh! There was an error while loading. Please reload this page. Diff view Unified Split Hide whitespace Diff view Unified Split Hide whitespace src/coreclr/tools/Common/InstructionSetHelpers.cs InstructionSetHelpers.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs R2RTestSuites.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs StripILBodies.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs R2RResultChecker.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs ReadyToRunInstructionSetSupportSignature.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs ReadyToRunCodegenCompilation.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs ReadyToRunCompilerContext.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj ILCompiler.ReadyToRun.csproj src/coreclr/tools/aot/crossgen2/Program.cs Program.cs src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj System.IO.Hashing.Tests.csproj src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/SignatureDecoderTests.cs SignatureDecoderTests.cs src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj System.Reflection.Metadata.Tests.csproj src/tests/JIT/Regression/Regression_o_2.csproj Regression_o_2.csproj Some comments aren't visible on the classic Files Changed page. There are no files selected for viewing 31 changes: 31 additions & 0 deletions 31 src/coreclr/tools/Common/InstructionSetHelpers.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -11,6 +11,7 @@ using Internal.TypeSystem; using InstructionSet = Internal.JitInterface.InstructionSet; using InstructionSetFlags = Internal.JitInterface.InstructionSetFlags; namespace System.CommandLine { Expand DownExpand Up @@ -353,5 +354,35 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru InstructionSetSupportBuilder.GetNonSpecifiableInstructionSetsForArch(targetArchitecture), targetArchitecture); } // Produces an InstructionSetSupport where the instruction sets are fixed at compile time: every // specifiable instruction set that is not already supported is marked explicitly unsupported, and the // supported sets are also treated as optimistic. This is used for targets without runtime code generation // (for example Apple mobile and WASM), where the pre-compiled code must hard code its ISA usage because // there is no JIT to recover from an instruction set mismatch. public static InstructionSetSupport GetFixedInstructionSetSupport(InstructionSetSupport instructionSetSupport) Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. { InstructionSetFlags unsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags; foreach (var instructionSetInfo in InstructionSetFlags.ArchitectureToValidInstructionSets(instructionSetSupport.Architecture)) { if (instructionSetInfo.Specifiable && !instructionSetSupport.IsInstructionSetSupported(instructionSetInfo.InstructionSet)) { unsupportedInstructionSets.AddInstructionSet(instructionSetInfo.InstructionSet); } } unsupportedInstructionSets.ExpandInstructionSetByReverseImplication(instructionSetSupport.Architecture); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. unsupportedInstructionSets.Set64BitInstructionSetVariants(instructionSetSupport.Architecture); if (instructionSetSupport.Architecture is TargetArchitecture.X86 or TargetArchitecture.ARM) unsupportedInstructionSets.Set64BitInstructionSetVariantsUnconditionally(instructionSetSupport.Architecture); return new InstructionSetSupport( instructionSetSupport.SupportedFlags, unsupportedInstructionSets, instructionSetSupport.SupportedFlags, instructionSetSupport.NonSpecifiableFlags, instructionSetSupport.Architecture); } } } 46 changes: 46 additions & 0 deletions 46 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -570,6 +570,7 @@ public void RuntimeAsyncStripILBodiesPreservesTaskReturningIL() new(nameof(RuntimeAsyncStripILBodiesPreservesTaskReturningIL), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetarch:x64"], Validate = Validate, }, ])); Expand All @@ -593,6 +594,7 @@ static void Validate(ReadyToRunReader reader) Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "ComputeTag", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "Root", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncTaskMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncValueTaskMethod", out diag), diag); Expand All @@ -604,6 +606,50 @@ static void Validate(ReadyToRunReader reader) } } [Fact] public void AppleMobileStripILBodiesUsesFixedInstructionSet() { var stripILBodies = new CompiledAssembly { AssemblyName = nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), SourceResourceNames = [ "RuntimeAsync/StripILBodies.cs", "RuntimeAsync/RuntimeAsyncMethodGenerationAttribute.cs", ], Features = { RuntimeAsyncFeature }, }; new R2RTestRunner(_output).Run(new R2RTestCase( nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [ new(nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetos:ios", "--targetarch:arm64"], Validate = Validate, }, ])); static void Validate(ReadyToRunReader reader) { string componentFile = Path.Combine( Path.GetDirectoryName(reader.Filename)!, nameof(AppleMobileStripILBodiesUsesFixedInstructionSet) + ".dll"); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out string diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.False( R2RAssert.HasFixupKindOnMethod( reader, ReadyToRunFixupKind.Check_InstructionSetSupport, ".UsesRuntimeCheckedInstructionSet(", out diag), diag); Assert.True(R2RAssert.EagerInstructionSetSupportHasNoUnsupportedEntries(reader, out diag), diag); } } /// <summary> /// PR #123643: Async methods capturing GC refs across await points /// produce ContinuationLayout fixups encoding the GC ref map. Expand Down 9 changes: 9 additions & 0 deletions 9 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -8,6 +8,9 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; using ArmAes = System.Runtime.Intrinsics.Arm.Aes; using X86Aes = System.Runtime.Intrinsics.X86.Aes; public static class StripILBodies { [MethodImpl(MethodImplOptions.NoInlining)] Expand DownExpand Up @@ -82,6 +85,12 @@ public static int PlainStrippableMethod(int a, int b) return a + b + ComputeTag(); } [MethodImpl(MethodImplOptions.NoInlining)] public static bool UsesRuntimeCheckedInstructionSet() { return X86Aes.IsSupported || ArmAes.IsSupported || ArmAes.Arm64.IsSupported; } [MethodImpl(MethodImplOptions.NoInlining)] private static int ComputeTag() { Expand Down 41 changes: 41 additions & 0 deletions 41 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -954,6 +954,47 @@ public static bool HasFixupKindCountOnMethod(ReadyToRunReader reader, ReadyToRun return true; } /// <summary> /// Returns true if the global eager baseline <see cref="ReadyToRunFixupKind.Check_InstructionSetSupport"/> /// fixup does not assert that any instruction set must be absent at runtime ("must be absent" entries render /// with a <c>-</c> suffix; supported entries use <c>+</c>). Targets that cannot generate code at runtime must /// not encode these assertions, as a failing eager fixup fatally disables all ReadyToRun code with no JIT fallback. /// </summary> Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. public static bool EagerInstructionSetSupportHasNoUnsupportedEntries(ReadyToRunReader reader, out string diagnostic) { var options = new SignatureFormattingOptions(); var signatures = new List<string>(); foreach (ReadyToRunImportSection section in reader.ImportSections) { if (section.Entries is null) continue; Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. foreach (ReadyToRunImportSection.ImportSectionEntry entry in section.Entries) { if (entry.Signature is not null && entry.Signature.FixupKind == ReadyToRunFixupKind.Check_InstructionSetSupport) signatures.Add(entry.Signature.ToString(options)); } } if (signatures.Count == 0) { diagnostic = "Expected a global Check_InstructionSetSupport eager fixup, but none was found."; return false; } var withUnsupported = signatures.Where(s => s.Contains('-')).ToList(); if (withUnsupported.Count > 0) { diagnostic = "Global Check_InstructionSetSupport fixup must not assert any instruction set is absent " + $"on no-JIT targets, but found: [{string.Join(", ", withUnsupported)}]"; return false; } diagnostic = $"Global Check_InstructionSetSupport fixup asserts only supported instruction sets: [{string.Join(", ", signatures)}]"; return true; } /// <summary> /// Returns true if the R2R image contains at least one fixup of the given kind. /// </summary> Expand Down 30 changes: 17 additions & 13 deletions 30 ...yToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -15,13 +15,11 @@ public class ReadyToRunInstructionSetSupportSignature : Signature { string _instructionSetsSupport; public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport) public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport, bool emitExplicitlyUnsupported = true) { StringBuilder builder = new StringBuilder(); InstructionSet[] supportedInstructionSets = instructionSetSupport.SupportedFlags.ToArray(); Array.Sort(supportedInstructionSets); InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); bool addDelimiter = false; var r2rAlreadyEmitted = new HashSet<ReadyToRunInstructionSet>(); Expand All @@ -43,19 +41,25 @@ public static string ToInstructionSetSupportString(InstructionSetSupport instruc builder.Append(','); r2rAlreadyEmitted.Clear(); addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) if (emitExplicitlyUnsupported) { var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); } } } Expand Down 7 changes: 5 additions & 2 deletions 7 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -382,8 +382,11 @@ internal ReadyToRunCodegenCompilation( CompilationModuleGroup = (ReadyToRunCompilationModuleGroupBase)nodeFactory.CompilationModuleGroup; // Generate baseline support specification for InstructionSetSupport. This will prevent usage of the generated // code if the runtime environment doesn't support the specified instruction set string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport); // code if the runtime environment doesn't support the specified instruction set. Targets that cannot generate // code at runtime must not encode "must be absent" assertions, since a failing eager fixup is a fatal startup // error with no JIT fallback (see ToInstructionSetSupportString). Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. bool targetAllowsRuntimeCodeGeneration = ((ReadyToRunCompilerContext)nodeFactory.TypeSystemContext).TargetAllowsRuntimeCodeGeneration; string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport, emitExplicitlyUnsupported: targetAllowsRuntimeCodeGeneration); ReadyToRunInstructionSetSupportSignature instructionSetSupportSig = new ReadyToRunInstructionSetSupportSignature(instructionSetSupportString); _dependencyGraph.AddRoot(new Import(NodeFactory.EagerImports, instructionSetSupportSig), "Baseline instruction set support"); Expand Down 24 changes: 3 additions & 21 deletions 24 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -58,11 +58,13 @@ public ReadyToRunCompilerContext( TargetDetails details, SharedGenericsMode genericsMode, bool bubbleIncludesCoreModule, bool targetAllowsRuntimeCodeGeneration, InstructionSetSupport instructionSetSupport, CompilerTypeSystemContext oldTypeSystemContext) : base(details, genericsMode) { BubbleIncludesCoreModule = bubbleIncludesCoreModule; TargetAllowsRuntimeCodeGeneration = targetAllowsRuntimeCodeGeneration; InstructionSetSupport = instructionSetSupport; _r2rFieldLayoutAlgorithm = new ReadyToRunMetadataFieldLayoutAlgorithm(); _systemObjectFieldLayoutAlgorithm = new SystemObjectFieldLayoutAlgorithm(_r2rFieldLayoutAlgorithm); Expand DownExpand Up @@ -99,27 +101,7 @@ public ReadyToRunCompilerContext( public InstructionSetSupport InstructionSetSupport { get; } public bool TargetAllowsRuntimeCodeGeneration { get { #if FEATURE_DYNAMIC_CODE_COMPILED if (Target.OperatingSystem is TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator) { return false; } if (Target.Architecture is TargetArchitecture.Wasm32) { return false; } return true; #else return false; #endif } } public bool TargetAllowsRuntimeCodeGeneration { get; } public override FieldLayoutAlgorithm GetLayoutAlgorithmForType(DefType type) { Expand Down 1 change: 0 additions & 1 deletion 1 src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -5,7 +5,6 @@ <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants> <DefineConstants Condition="'$(FeatureDynamicCodeCompiled)' == 'true'">$(DefineConstants);FEATURE_DYNAMIC_CODE_COMPILED</DefineConstants> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Platforms>x64;x86;arm;arm64</Platforms> <PlatformTarget>AnyCPU</PlatformTarget> Expand Down 35 changes: 24 additions & 11 deletions 35 src/coreclr/tools/aot/crossgen2/Program.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -76,29 +76,34 @@ public int Run() var logger = new Logger(Console.Out, Get(_command.IsVerbose)); // Crossgen2 is partial AOT and its pre-compiled methods can be // thrown away at runtime if they mismatch in required ISAs or // computed layouts of structs. Thus we want to ensure that usage // of Vector<T> is only optimistic and doesn't hard code a dependency // that would cause the entire image to be invalidated. bool isVectorTOptimistic = true; (TargetArchitecture targetArchitecture, TargetOS targetOS, TargetAbi targetAbi) = Helpers.GetTargetSpec(Get(_command.TargetArchitecture), Get(_command.TargetOS)); bool targetAllowsRuntimeCodeGeneration = GetTargetAllowsRuntimeCodeGeneration(targetOS, targetArchitecture); // Crossgen2 is partial AOT and its pre-compiled methods can be thrown away at runtime if // they mismatch in required ISAs or computed layouts of structs. On targets that allow // runtime code generation we keep Vector<T> usage optimistic so we never hard code a // dependency that could invalidate the entire image. On targets that do not allow // runtime code generation, we do not want an ISA mismatch to invalidate any code // in the image. There we make Vector<T> non-optimistic and hard code the ISA support // to avoid falling back to the interpreter. bool isVectorTOptimistic = targetAllowsRuntimeCodeGeneration; bool allowOptimistic = _command.OptimizationMode != OptimizationMode.PreferSize; if (targetOS is TargetOS.iOS or TargetOS.tvOS or TargetOS.iOSSimulator or TargetOS.tvOSSimulator or TargetOS.MacCatalyst or TargetOS.Browser or TargetOS.Wasi) if (!targetAllowsRuntimeCodeGeneration) { // These platforms do not support jitted code, so we want to ensure that we don't // need to fall back to the interpreter for any hardware-intrinsic optimizations. // Disable optimistic instruction sets by default. allowOptimistic = false; } InstructionSetSupport instructionSetSupport = Helpers.ConfigureInstructionSetSupport(Get(_command.InstructionSet), Get(_command.MaxVectorTBitWidth), isVectorTOptimistic, targetArchitecture, targetOS, SR.InstructionSetMustNotBe, SR.InstructionSetInvalidImplication, logger, allowOptimistic: allowOptimistic, isReadyToRun: true); if (!targetAllowsRuntimeCodeGeneration) { instructionSetSupport = Helpers.GetFixedInstructionSetSupport(instructionSetSupport); } SharedGenericsMode genericsMode = SharedGenericsMode.CanonicalReferenceTypes; var targetDetails = new TargetDetails(targetArchitecture, targetOS, targetAbi, instructionSetSupport.GetVectorTSimdVector()); Expand DownExpand Up @@ -142,6 +147,7 @@ public int Run() // Initialize type system context // _typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, versionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, instructionSetSupport, oldTypeSystemContext: null); Expand DownExpand Up @@ -286,6 +292,7 @@ public int Run() bool singleCompilationVersionBubbleIncludesCoreLib = versionBubbleIncludesCoreLib || (String.Compare(inputFile.Key, "System.Private.CoreLib", StringComparison.OrdinalIgnoreCase) == 0); typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, singleCompilationVersionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, _typeSystemContext.InstructionSetSupport, _typeSystemContext); typeSystemContext.InputFilePaths = singleCompilationInputFilePaths; Expand DownExpand Up @@ -700,6 +707,12 @@ private void RunSingleCompilation(Dictionary<string, string> inFilePaths, Instru } } private static bool GetTargetAllowsRuntimeCodeGeneration(TargetOS operatingSystem, TargetArchitecture architecture) { return operatingSystem is not (TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator or TargetOS.Browser or TargetOS.Wasi) && architecture is not TargetArchitecture.Wasm32; } private void CheckManagedCppInputFiles(IEnumerable<string> inputPaths) { foreach (string inputFilePath in inputPaths) Expand Down Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later. Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , '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 contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. dotnet /runtimePublic Notifications You must be signed in to change notification settings Fork 5.6k Star 18.2k Code Issues5k+ Pull requests563 Discussions Actions Projects Security and quality67 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights Preserve IL for CoreCLR interpreter fallback on Apple mobile#130622 New issue Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community. Sign up for GitHub By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails. Already on GitHub? Sign in to your account Merged kotlarmilos merged 22 commits into main from copilot/clr-ios-track-il-stripping-issuesJul 28, 2026 +181 −53 Conversation 98 Commits 22 Checks 193 Files changed 13 Merged Preserve IL for CoreCLR interpreter fallback on Apple mobile #130622 Show file tree Hide file tree Changes from all commits Commits Show all changes 22 commits Select commit Hold shift + click to select a range eacd9d2 Initial plan Copilot Jul 13, 2026f5f5cce Preserve IL for CoreCLR interpreter fallback Copilot Jul 13, 20267462331 Complete IL stripping validation Copilot Jul 13, 2026bbff0da Fix fixed ISA handling for stripped R2R images kotlarmilos Jul 14, 20267276e8a Merge main into IL stripping fixes kotlarmilos Jul 14, 20266f8d7a0 Potential fix for pull request finding kotlarmilos Jul 14, 202612d0b93 Potential fix for pull request finding kotlarmilos Jul 14, 20263b82391 Address fixed instruction set review feedback kotlarmilos Jul 15, 2026a4ce2cf Keep fixed ISA handling in crossgen2 kotlarmilos Jul 16, 20267729441 Restore existing CorInfo formatting kotlarmilos Jul 16, 2026ab2af53 Remove unrelated formatting changes kotlarmilos Jul 16, 2026027c501 Dedup fixed-instruction-set target check and relocate crossgen2 ISA h… kotlarmilos Jul 17, 2026c099887 Drop doc comment on IsFixedInstructionSetTarget for parity with surro… kotlarmilos Jul 17, 20268b8c810 Drop comment on GetFixedInstructionSetSupport for parity with surroun… kotlarmilos Jul 17, 20263309739 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 17, 20267d4fd8b Refactor crossgen2 fixed-instruction-set handling per review feedback kotlarmilos Jul 20, 20265c33a99 Fix Apple mobile ReadyToRun startup crash from baseline instruction-s… kotlarmilos Jul 20, 20264537bbc Drop explanatory comment on baseline signature unsupported-entry guard kotlarmilos Jul 20, 20269c231ea Move GetTargetAllowsRuntimeCodeGeneration into crossgen2 Program.cs kotlarmilos Jul 21, 2026c86b9e1 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 21, 2026fae3aeb Remove host-specific FEATURE_DYNAMIC_CODE_COMPILED gating from crossgen2 kotlarmilos Jul 22, 20267e1cc8d Remove dead FEATURE_DYNAMIC_CODE_COMPILED define from ILCompiler.Read… kotlarmilos Jul 22, 2026 File filter Filter by extension Filter by extension .cs (9) .csproj (4) All 2 file types selected Only manifest files Viewed files Clear filters Conversations Failed to load comments. Loading Uh oh! There was an error while loading. Please reload this page. Jump to Jump to file Failed to load files. Loading Uh oh! There was an error while loading. Please reload this page. Diff view Unified Split Hide whitespace Diff view Unified Split Hide whitespace src/coreclr/tools/Common/InstructionSetHelpers.cs InstructionSetHelpers.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs R2RTestSuites.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs StripILBodies.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs R2RResultChecker.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs ReadyToRunInstructionSetSupportSignature.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs ReadyToRunCodegenCompilation.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs ReadyToRunCompilerContext.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj ILCompiler.ReadyToRun.csproj src/coreclr/tools/aot/crossgen2/Program.cs Program.cs src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj System.IO.Hashing.Tests.csproj src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/SignatureDecoderTests.cs SignatureDecoderTests.cs src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj System.Reflection.Metadata.Tests.csproj src/tests/JIT/Regression/Regression_o_2.csproj Regression_o_2.csproj Some comments aren't visible on the classic Files Changed page. There are no files selected for viewing 31 changes: 31 additions & 0 deletions 31 src/coreclr/tools/Common/InstructionSetHelpers.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -11,6 +11,7 @@ using Internal.TypeSystem; using InstructionSet = Internal.JitInterface.InstructionSet; using InstructionSetFlags = Internal.JitInterface.InstructionSetFlags; namespace System.CommandLine { Expand DownExpand Up @@ -353,5 +354,35 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru InstructionSetSupportBuilder.GetNonSpecifiableInstructionSetsForArch(targetArchitecture), targetArchitecture); } // Produces an InstructionSetSupport where the instruction sets are fixed at compile time: every // specifiable instruction set that is not already supported is marked explicitly unsupported, and the // supported sets are also treated as optimistic. This is used for targets without runtime code generation // (for example Apple mobile and WASM), where the pre-compiled code must hard code its ISA usage because // there is no JIT to recover from an instruction set mismatch. public static InstructionSetSupport GetFixedInstructionSetSupport(InstructionSetSupport instructionSetSupport) Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. { InstructionSetFlags unsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags; foreach (var instructionSetInfo in InstructionSetFlags.ArchitectureToValidInstructionSets(instructionSetSupport.Architecture)) { if (instructionSetInfo.Specifiable && !instructionSetSupport.IsInstructionSetSupported(instructionSetInfo.InstructionSet)) { unsupportedInstructionSets.AddInstructionSet(instructionSetInfo.InstructionSet); } } unsupportedInstructionSets.ExpandInstructionSetByReverseImplication(instructionSetSupport.Architecture); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. unsupportedInstructionSets.Set64BitInstructionSetVariants(instructionSetSupport.Architecture); if (instructionSetSupport.Architecture is TargetArchitecture.X86 or TargetArchitecture.ARM) unsupportedInstructionSets.Set64BitInstructionSetVariantsUnconditionally(instructionSetSupport.Architecture); return new InstructionSetSupport( instructionSetSupport.SupportedFlags, unsupportedInstructionSets, instructionSetSupport.SupportedFlags, instructionSetSupport.NonSpecifiableFlags, instructionSetSupport.Architecture); } } } 46 changes: 46 additions & 0 deletions 46 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -570,6 +570,7 @@ public void RuntimeAsyncStripILBodiesPreservesTaskReturningIL() new(nameof(RuntimeAsyncStripILBodiesPreservesTaskReturningIL), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetarch:x64"], Validate = Validate, }, ])); Expand All @@ -593,6 +594,7 @@ static void Validate(ReadyToRunReader reader) Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "ComputeTag", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "Root", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncTaskMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncValueTaskMethod", out diag), diag); Expand All @@ -604,6 +606,50 @@ static void Validate(ReadyToRunReader reader) } } [Fact] public void AppleMobileStripILBodiesUsesFixedInstructionSet() { var stripILBodies = new CompiledAssembly { AssemblyName = nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), SourceResourceNames = [ "RuntimeAsync/StripILBodies.cs", "RuntimeAsync/RuntimeAsyncMethodGenerationAttribute.cs", ], Features = { RuntimeAsyncFeature }, }; new R2RTestRunner(_output).Run(new R2RTestCase( nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [ new(nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetos:ios", "--targetarch:arm64"], Validate = Validate, }, ])); static void Validate(ReadyToRunReader reader) { string componentFile = Path.Combine( Path.GetDirectoryName(reader.Filename)!, nameof(AppleMobileStripILBodiesUsesFixedInstructionSet) + ".dll"); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out string diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.False( R2RAssert.HasFixupKindOnMethod( reader, ReadyToRunFixupKind.Check_InstructionSetSupport, ".UsesRuntimeCheckedInstructionSet(", out diag), diag); Assert.True(R2RAssert.EagerInstructionSetSupportHasNoUnsupportedEntries(reader, out diag), diag); } } /// <summary> /// PR #123643: Async methods capturing GC refs across await points /// produce ContinuationLayout fixups encoding the GC ref map. Expand Down 9 changes: 9 additions & 0 deletions 9 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -8,6 +8,9 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; using ArmAes = System.Runtime.Intrinsics.Arm.Aes; using X86Aes = System.Runtime.Intrinsics.X86.Aes; public static class StripILBodies { [MethodImpl(MethodImplOptions.NoInlining)] Expand DownExpand Up @@ -82,6 +85,12 @@ public static int PlainStrippableMethod(int a, int b) return a + b + ComputeTag(); } [MethodImpl(MethodImplOptions.NoInlining)] public static bool UsesRuntimeCheckedInstructionSet() { return X86Aes.IsSupported || ArmAes.IsSupported || ArmAes.Arm64.IsSupported; } [MethodImpl(MethodImplOptions.NoInlining)] private static int ComputeTag() { Expand Down 41 changes: 41 additions & 0 deletions 41 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -954,6 +954,47 @@ public static bool HasFixupKindCountOnMethod(ReadyToRunReader reader, ReadyToRun return true; } /// <summary> /// Returns true if the global eager baseline <see cref="ReadyToRunFixupKind.Check_InstructionSetSupport"/> /// fixup does not assert that any instruction set must be absent at runtime ("must be absent" entries render /// with a <c>-</c> suffix; supported entries use <c>+</c>). Targets that cannot generate code at runtime must /// not encode these assertions, as a failing eager fixup fatally disables all ReadyToRun code with no JIT fallback. /// </summary> Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. public static bool EagerInstructionSetSupportHasNoUnsupportedEntries(ReadyToRunReader reader, out string diagnostic) { var options = new SignatureFormattingOptions(); var signatures = new List<string>(); foreach (ReadyToRunImportSection section in reader.ImportSections) { if (section.Entries is null) continue; Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. foreach (ReadyToRunImportSection.ImportSectionEntry entry in section.Entries) { if (entry.Signature is not null && entry.Signature.FixupKind == ReadyToRunFixupKind.Check_InstructionSetSupport) signatures.Add(entry.Signature.ToString(options)); } } if (signatures.Count == 0) { diagnostic = "Expected a global Check_InstructionSetSupport eager fixup, but none was found."; return false; } var withUnsupported = signatures.Where(s => s.Contains('-')).ToList(); if (withUnsupported.Count > 0) { diagnostic = "Global Check_InstructionSetSupport fixup must not assert any instruction set is absent " + $"on no-JIT targets, but found: [{string.Join(", ", withUnsupported)}]"; return false; } diagnostic = $"Global Check_InstructionSetSupport fixup asserts only supported instruction sets: [{string.Join(", ", signatures)}]"; return true; } /// <summary> /// Returns true if the R2R image contains at least one fixup of the given kind. /// </summary> Expand Down 30 changes: 17 additions & 13 deletions 30 ...yToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -15,13 +15,11 @@ public class ReadyToRunInstructionSetSupportSignature : Signature { string _instructionSetsSupport; public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport) public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport, bool emitExplicitlyUnsupported = true) { StringBuilder builder = new StringBuilder(); InstructionSet[] supportedInstructionSets = instructionSetSupport.SupportedFlags.ToArray(); Array.Sort(supportedInstructionSets); InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); bool addDelimiter = false; var r2rAlreadyEmitted = new HashSet<ReadyToRunInstructionSet>(); Expand All @@ -43,19 +41,25 @@ public static string ToInstructionSetSupportString(InstructionSetSupport instruc builder.Append(','); r2rAlreadyEmitted.Clear(); addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) if (emitExplicitlyUnsupported) { var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); } } } Expand Down 7 changes: 5 additions & 2 deletions 7 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -382,8 +382,11 @@ internal ReadyToRunCodegenCompilation( CompilationModuleGroup = (ReadyToRunCompilationModuleGroupBase)nodeFactory.CompilationModuleGroup; // Generate baseline support specification for InstructionSetSupport. This will prevent usage of the generated // code if the runtime environment doesn't support the specified instruction set string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport); // code if the runtime environment doesn't support the specified instruction set. Targets that cannot generate // code at runtime must not encode "must be absent" assertions, since a failing eager fixup is a fatal startup // error with no JIT fallback (see ToInstructionSetSupportString). Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. bool targetAllowsRuntimeCodeGeneration = ((ReadyToRunCompilerContext)nodeFactory.TypeSystemContext).TargetAllowsRuntimeCodeGeneration; string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport, emitExplicitlyUnsupported: targetAllowsRuntimeCodeGeneration); ReadyToRunInstructionSetSupportSignature instructionSetSupportSig = new ReadyToRunInstructionSetSupportSignature(instructionSetSupportString); _dependencyGraph.AddRoot(new Import(NodeFactory.EagerImports, instructionSetSupportSig), "Baseline instruction set support"); Expand Down 24 changes: 3 additions & 21 deletions 24 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -58,11 +58,13 @@ public ReadyToRunCompilerContext( TargetDetails details, SharedGenericsMode genericsMode, bool bubbleIncludesCoreModule, bool targetAllowsRuntimeCodeGeneration, InstructionSetSupport instructionSetSupport, CompilerTypeSystemContext oldTypeSystemContext) : base(details, genericsMode) { BubbleIncludesCoreModule = bubbleIncludesCoreModule; TargetAllowsRuntimeCodeGeneration = targetAllowsRuntimeCodeGeneration; InstructionSetSupport = instructionSetSupport; _r2rFieldLayoutAlgorithm = new ReadyToRunMetadataFieldLayoutAlgorithm(); _systemObjectFieldLayoutAlgorithm = new SystemObjectFieldLayoutAlgorithm(_r2rFieldLayoutAlgorithm); Expand DownExpand Up @@ -99,27 +101,7 @@ public ReadyToRunCompilerContext( public InstructionSetSupport InstructionSetSupport { get; } public bool TargetAllowsRuntimeCodeGeneration { get { #if FEATURE_DYNAMIC_CODE_COMPILED if (Target.OperatingSystem is TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator) { return false; } if (Target.Architecture is TargetArchitecture.Wasm32) { return false; } return true; #else return false; #endif } } public bool TargetAllowsRuntimeCodeGeneration { get; } public override FieldLayoutAlgorithm GetLayoutAlgorithmForType(DefType type) { Expand Down 1 change: 0 additions & 1 deletion 1 src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -5,7 +5,6 @@ <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants> <DefineConstants Condition="'$(FeatureDynamicCodeCompiled)' == 'true'">$(DefineConstants);FEATURE_DYNAMIC_CODE_COMPILED</DefineConstants> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Platforms>x64;x86;arm;arm64</Platforms> <PlatformTarget>AnyCPU</PlatformTarget> Expand Down 35 changes: 24 additions & 11 deletions 35 src/coreclr/tools/aot/crossgen2/Program.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -76,29 +76,34 @@ public int Run() var logger = new Logger(Console.Out, Get(_command.IsVerbose)); // Crossgen2 is partial AOT and its pre-compiled methods can be // thrown away at runtime if they mismatch in required ISAs or // computed layouts of structs. Thus we want to ensure that usage // of Vector<T> is only optimistic and doesn't hard code a dependency // that would cause the entire image to be invalidated. bool isVectorTOptimistic = true; (TargetArchitecture targetArchitecture, TargetOS targetOS, TargetAbi targetAbi) = Helpers.GetTargetSpec(Get(_command.TargetArchitecture), Get(_command.TargetOS)); bool targetAllowsRuntimeCodeGeneration = GetTargetAllowsRuntimeCodeGeneration(targetOS, targetArchitecture); // Crossgen2 is partial AOT and its pre-compiled methods can be thrown away at runtime if // they mismatch in required ISAs or computed layouts of structs. On targets that allow // runtime code generation we keep Vector<T> usage optimistic so we never hard code a // dependency that could invalidate the entire image. On targets that do not allow // runtime code generation, we do not want an ISA mismatch to invalidate any code // in the image. There we make Vector<T> non-optimistic and hard code the ISA support // to avoid falling back to the interpreter. bool isVectorTOptimistic = targetAllowsRuntimeCodeGeneration; bool allowOptimistic = _command.OptimizationMode != OptimizationMode.PreferSize; if (targetOS is TargetOS.iOS or TargetOS.tvOS or TargetOS.iOSSimulator or TargetOS.tvOSSimulator or TargetOS.MacCatalyst or TargetOS.Browser or TargetOS.Wasi) if (!targetAllowsRuntimeCodeGeneration) { // These platforms do not support jitted code, so we want to ensure that we don't // need to fall back to the interpreter for any hardware-intrinsic optimizations. // Disable optimistic instruction sets by default. allowOptimistic = false; } InstructionSetSupport instructionSetSupport = Helpers.ConfigureInstructionSetSupport(Get(_command.InstructionSet), Get(_command.MaxVectorTBitWidth), isVectorTOptimistic, targetArchitecture, targetOS, SR.InstructionSetMustNotBe, SR.InstructionSetInvalidImplication, logger, allowOptimistic: allowOptimistic, isReadyToRun: true); if (!targetAllowsRuntimeCodeGeneration) { instructionSetSupport = Helpers.GetFixedInstructionSetSupport(instructionSetSupport); } SharedGenericsMode genericsMode = SharedGenericsMode.CanonicalReferenceTypes; var targetDetails = new TargetDetails(targetArchitecture, targetOS, targetAbi, instructionSetSupport.GetVectorTSimdVector()); Expand DownExpand Up @@ -142,6 +147,7 @@ public int Run() // Initialize type system context // _typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, versionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, instructionSetSupport, oldTypeSystemContext: null); Expand DownExpand Up @@ -286,6 +292,7 @@ public int Run() bool singleCompilationVersionBubbleIncludesCoreLib = versionBubbleIncludesCoreLib || (String.Compare(inputFile.Key, "System.Private.CoreLib", StringComparison.OrdinalIgnoreCase) == 0); typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, singleCompilationVersionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, _typeSystemContext.InstructionSetSupport, _typeSystemContext); typeSystemContext.InputFilePaths = singleCompilationInputFilePaths; Expand DownExpand Up @@ -700,6 +707,12 @@ private void RunSingleCompilation(Dictionary<string, string> inFilePaths, Instru } } private static bool GetTargetAllowsRuntimeCodeGeneration(TargetOS operatingSystem, TargetArchitecture architecture) { return operatingSystem is not (TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator or TargetOS.Browser or TargetOS.Wasi) && architecture is not TargetArchitecture.Wasm32; } private void CheckManagedCppInputFiles(IEnumerable<string> inputPaths) { foreach (string inputFilePath in inputPaths) Expand Down Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later. Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , '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 contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. dotnet /runtimePublic Notifications You must be signed in to change notification settings Fork 5.6k Star 18.2k Code Issues5k+ Pull requests563 Discussions Actions Projects Security and quality67 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights Preserve IL for CoreCLR interpreter fallback on Apple mobile#130622 New issue Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community. Sign up for GitHub By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails. Already on GitHub? Sign in to your account Merged kotlarmilos merged 22 commits into main from copilot/clr-ios-track-il-stripping-issuesJul 28, 2026 +181 −53 Conversation 98 Commits 22 Checks 193 Files changed 13 Merged Preserve IL for CoreCLR interpreter fallback on Apple mobile #130622 Show file tree Hide file tree Changes from all commits Commits Show all changes 22 commits Select commit Hold shift + click to select a range eacd9d2 Initial plan Copilot Jul 13, 2026f5f5cce Preserve IL for CoreCLR interpreter fallback Copilot Jul 13, 20267462331 Complete IL stripping validation Copilot Jul 13, 2026bbff0da Fix fixed ISA handling for stripped R2R images kotlarmilos Jul 14, 20267276e8a Merge main into IL stripping fixes kotlarmilos Jul 14, 20266f8d7a0 Potential fix for pull request finding kotlarmilos Jul 14, 202612d0b93 Potential fix for pull request finding kotlarmilos Jul 14, 20263b82391 Address fixed instruction set review feedback kotlarmilos Jul 15, 2026a4ce2cf Keep fixed ISA handling in crossgen2 kotlarmilos Jul 16, 20267729441 Restore existing CorInfo formatting kotlarmilos Jul 16, 2026ab2af53 Remove unrelated formatting changes kotlarmilos Jul 16, 2026027c501 Dedup fixed-instruction-set target check and relocate crossgen2 ISA h… kotlarmilos Jul 17, 2026c099887 Drop doc comment on IsFixedInstructionSetTarget for parity with surro… kotlarmilos Jul 17, 20268b8c810 Drop comment on GetFixedInstructionSetSupport for parity with surroun… kotlarmilos Jul 17, 20263309739 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 17, 20267d4fd8b Refactor crossgen2 fixed-instruction-set handling per review feedback kotlarmilos Jul 20, 20265c33a99 Fix Apple mobile ReadyToRun startup crash from baseline instruction-s… kotlarmilos Jul 20, 20264537bbc Drop explanatory comment on baseline signature unsupported-entry guard kotlarmilos Jul 20, 20269c231ea Move GetTargetAllowsRuntimeCodeGeneration into crossgen2 Program.cs kotlarmilos Jul 21, 2026c86b9e1 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 21, 2026fae3aeb Remove host-specific FEATURE_DYNAMIC_CODE_COMPILED gating from crossgen2 kotlarmilos Jul 22, 20267e1cc8d Remove dead FEATURE_DYNAMIC_CODE_COMPILED define from ILCompiler.Read… kotlarmilos Jul 22, 2026 File filter Filter by extension Filter by extension .cs (9) .csproj (4) All 2 file types selected Only manifest files Viewed files Clear filters Conversations Failed to load comments. Loading Uh oh! There was an error while loading. Please reload this page. Jump to Jump to file Failed to load files. Loading Uh oh! There was an error while loading. Please reload this page. Diff view Unified Split Hide whitespace Diff view Unified Split Hide whitespace src/coreclr/tools/Common/InstructionSetHelpers.cs InstructionSetHelpers.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs R2RTestSuites.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs StripILBodies.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs R2RResultChecker.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs ReadyToRunInstructionSetSupportSignature.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs ReadyToRunCodegenCompilation.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs ReadyToRunCompilerContext.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj ILCompiler.ReadyToRun.csproj src/coreclr/tools/aot/crossgen2/Program.cs Program.cs src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj System.IO.Hashing.Tests.csproj src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/SignatureDecoderTests.cs SignatureDecoderTests.cs src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj System.Reflection.Metadata.Tests.csproj src/tests/JIT/Regression/Regression_o_2.csproj Regression_o_2.csproj Some comments aren't visible on the classic Files Changed page. There are no files selected for viewing 31 changes: 31 additions & 0 deletions 31 src/coreclr/tools/Common/InstructionSetHelpers.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -11,6 +11,7 @@ using Internal.TypeSystem; using InstructionSet = Internal.JitInterface.InstructionSet; using InstructionSetFlags = Internal.JitInterface.InstructionSetFlags; namespace System.CommandLine { Expand DownExpand Up @@ -353,5 +354,35 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru InstructionSetSupportBuilder.GetNonSpecifiableInstructionSetsForArch(targetArchitecture), targetArchitecture); } // Produces an InstructionSetSupport where the instruction sets are fixed at compile time: every // specifiable instruction set that is not already supported is marked explicitly unsupported, and the // supported sets are also treated as optimistic. This is used for targets without runtime code generation // (for example Apple mobile and WASM), where the pre-compiled code must hard code its ISA usage because // there is no JIT to recover from an instruction set mismatch. public static InstructionSetSupport GetFixedInstructionSetSupport(InstructionSetSupport instructionSetSupport) Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. { InstructionSetFlags unsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags; foreach (var instructionSetInfo in InstructionSetFlags.ArchitectureToValidInstructionSets(instructionSetSupport.Architecture)) { if (instructionSetInfo.Specifiable && !instructionSetSupport.IsInstructionSetSupported(instructionSetInfo.InstructionSet)) { unsupportedInstructionSets.AddInstructionSet(instructionSetInfo.InstructionSet); } } unsupportedInstructionSets.ExpandInstructionSetByReverseImplication(instructionSetSupport.Architecture); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. unsupportedInstructionSets.Set64BitInstructionSetVariants(instructionSetSupport.Architecture); if (instructionSetSupport.Architecture is TargetArchitecture.X86 or TargetArchitecture.ARM) unsupportedInstructionSets.Set64BitInstructionSetVariantsUnconditionally(instructionSetSupport.Architecture); return new InstructionSetSupport( instructionSetSupport.SupportedFlags, unsupportedInstructionSets, instructionSetSupport.SupportedFlags, instructionSetSupport.NonSpecifiableFlags, instructionSetSupport.Architecture); } } } 46 changes: 46 additions & 0 deletions 46 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -570,6 +570,7 @@ public void RuntimeAsyncStripILBodiesPreservesTaskReturningIL() new(nameof(RuntimeAsyncStripILBodiesPreservesTaskReturningIL), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetarch:x64"], Validate = Validate, }, ])); Expand All @@ -593,6 +594,7 @@ static void Validate(ReadyToRunReader reader) Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "ComputeTag", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "Root", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncTaskMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncValueTaskMethod", out diag), diag); Expand All @@ -604,6 +606,50 @@ static void Validate(ReadyToRunReader reader) } } [Fact] public void AppleMobileStripILBodiesUsesFixedInstructionSet() { var stripILBodies = new CompiledAssembly { AssemblyName = nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), SourceResourceNames = [ "RuntimeAsync/StripILBodies.cs", "RuntimeAsync/RuntimeAsyncMethodGenerationAttribute.cs", ], Features = { RuntimeAsyncFeature }, }; new R2RTestRunner(_output).Run(new R2RTestCase( nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [ new(nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetos:ios", "--targetarch:arm64"], Validate = Validate, }, ])); static void Validate(ReadyToRunReader reader) { string componentFile = Path.Combine( Path.GetDirectoryName(reader.Filename)!, nameof(AppleMobileStripILBodiesUsesFixedInstructionSet) + ".dll"); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out string diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.False( R2RAssert.HasFixupKindOnMethod( reader, ReadyToRunFixupKind.Check_InstructionSetSupport, ".UsesRuntimeCheckedInstructionSet(", out diag), diag); Assert.True(R2RAssert.EagerInstructionSetSupportHasNoUnsupportedEntries(reader, out diag), diag); } } /// <summary> /// PR #123643: Async methods capturing GC refs across await points /// produce ContinuationLayout fixups encoding the GC ref map. Expand Down 9 changes: 9 additions & 0 deletions 9 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -8,6 +8,9 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; using ArmAes = System.Runtime.Intrinsics.Arm.Aes; using X86Aes = System.Runtime.Intrinsics.X86.Aes; public static class StripILBodies { [MethodImpl(MethodImplOptions.NoInlining)] Expand DownExpand Up @@ -82,6 +85,12 @@ public static int PlainStrippableMethod(int a, int b) return a + b + ComputeTag(); } [MethodImpl(MethodImplOptions.NoInlining)] public static bool UsesRuntimeCheckedInstructionSet() { return X86Aes.IsSupported || ArmAes.IsSupported || ArmAes.Arm64.IsSupported; } [MethodImpl(MethodImplOptions.NoInlining)] private static int ComputeTag() { Expand Down 41 changes: 41 additions & 0 deletions 41 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -954,6 +954,47 @@ public static bool HasFixupKindCountOnMethod(ReadyToRunReader reader, ReadyToRun return true; } /// <summary> /// Returns true if the global eager baseline <see cref="ReadyToRunFixupKind.Check_InstructionSetSupport"/> /// fixup does not assert that any instruction set must be absent at runtime ("must be absent" entries render /// with a <c>-</c> suffix; supported entries use <c>+</c>). Targets that cannot generate code at runtime must /// not encode these assertions, as a failing eager fixup fatally disables all ReadyToRun code with no JIT fallback. /// </summary> Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. public static bool EagerInstructionSetSupportHasNoUnsupportedEntries(ReadyToRunReader reader, out string diagnostic) { var options = new SignatureFormattingOptions(); var signatures = new List<string>(); foreach (ReadyToRunImportSection section in reader.ImportSections) { if (section.Entries is null) continue; Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. foreach (ReadyToRunImportSection.ImportSectionEntry entry in section.Entries) { if (entry.Signature is not null && entry.Signature.FixupKind == ReadyToRunFixupKind.Check_InstructionSetSupport) signatures.Add(entry.Signature.ToString(options)); } } if (signatures.Count == 0) { diagnostic = "Expected a global Check_InstructionSetSupport eager fixup, but none was found."; return false; } var withUnsupported = signatures.Where(s => s.Contains('-')).ToList(); if (withUnsupported.Count > 0) { diagnostic = "Global Check_InstructionSetSupport fixup must not assert any instruction set is absent " + $"on no-JIT targets, but found: [{string.Join(", ", withUnsupported)}]"; return false; } diagnostic = $"Global Check_InstructionSetSupport fixup asserts only supported instruction sets: [{string.Join(", ", signatures)}]"; return true; } /// <summary> /// Returns true if the R2R image contains at least one fixup of the given kind. /// </summary> Expand Down 30 changes: 17 additions & 13 deletions 30 ...yToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -15,13 +15,11 @@ public class ReadyToRunInstructionSetSupportSignature : Signature { string _instructionSetsSupport; public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport) public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport, bool emitExplicitlyUnsupported = true) { StringBuilder builder = new StringBuilder(); InstructionSet[] supportedInstructionSets = instructionSetSupport.SupportedFlags.ToArray(); Array.Sort(supportedInstructionSets); InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); bool addDelimiter = false; var r2rAlreadyEmitted = new HashSet<ReadyToRunInstructionSet>(); Expand All @@ -43,19 +41,25 @@ public static string ToInstructionSetSupportString(InstructionSetSupport instruc builder.Append(','); r2rAlreadyEmitted.Clear(); addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) if (emitExplicitlyUnsupported) { var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); } } } Expand Down 7 changes: 5 additions & 2 deletions 7 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -382,8 +382,11 @@ internal ReadyToRunCodegenCompilation( CompilationModuleGroup = (ReadyToRunCompilationModuleGroupBase)nodeFactory.CompilationModuleGroup; // Generate baseline support specification for InstructionSetSupport. This will prevent usage of the generated // code if the runtime environment doesn't support the specified instruction set string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport); // code if the runtime environment doesn't support the specified instruction set. Targets that cannot generate // code at runtime must not encode "must be absent" assertions, since a failing eager fixup is a fatal startup // error with no JIT fallback (see ToInstructionSetSupportString). Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. bool targetAllowsRuntimeCodeGeneration = ((ReadyToRunCompilerContext)nodeFactory.TypeSystemContext).TargetAllowsRuntimeCodeGeneration; string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport, emitExplicitlyUnsupported: targetAllowsRuntimeCodeGeneration); ReadyToRunInstructionSetSupportSignature instructionSetSupportSig = new ReadyToRunInstructionSetSupportSignature(instructionSetSupportString); _dependencyGraph.AddRoot(new Import(NodeFactory.EagerImports, instructionSetSupportSig), "Baseline instruction set support"); Expand Down 24 changes: 3 additions & 21 deletions 24 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -58,11 +58,13 @@ public ReadyToRunCompilerContext( TargetDetails details, SharedGenericsMode genericsMode, bool bubbleIncludesCoreModule, bool targetAllowsRuntimeCodeGeneration, InstructionSetSupport instructionSetSupport, CompilerTypeSystemContext oldTypeSystemContext) : base(details, genericsMode) { BubbleIncludesCoreModule = bubbleIncludesCoreModule; TargetAllowsRuntimeCodeGeneration = targetAllowsRuntimeCodeGeneration; InstructionSetSupport = instructionSetSupport; _r2rFieldLayoutAlgorithm = new ReadyToRunMetadataFieldLayoutAlgorithm(); _systemObjectFieldLayoutAlgorithm = new SystemObjectFieldLayoutAlgorithm(_r2rFieldLayoutAlgorithm); Expand DownExpand Up @@ -99,27 +101,7 @@ public ReadyToRunCompilerContext( public InstructionSetSupport InstructionSetSupport { get; } public bool TargetAllowsRuntimeCodeGeneration { get { #if FEATURE_DYNAMIC_CODE_COMPILED if (Target.OperatingSystem is TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator) { return false; } if (Target.Architecture is TargetArchitecture.Wasm32) { return false; } return true; #else return false; #endif } } public bool TargetAllowsRuntimeCodeGeneration { get; } public override FieldLayoutAlgorithm GetLayoutAlgorithmForType(DefType type) { Expand Down 1 change: 0 additions & 1 deletion 1 src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -5,7 +5,6 @@ <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants> <DefineConstants Condition="'$(FeatureDynamicCodeCompiled)' == 'true'">$(DefineConstants);FEATURE_DYNAMIC_CODE_COMPILED</DefineConstants> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Platforms>x64;x86;arm;arm64</Platforms> <PlatformTarget>AnyCPU</PlatformTarget> Expand Down 35 changes: 24 additions & 11 deletions 35 src/coreclr/tools/aot/crossgen2/Program.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -76,29 +76,34 @@ public int Run() var logger = new Logger(Console.Out, Get(_command.IsVerbose)); // Crossgen2 is partial AOT and its pre-compiled methods can be // thrown away at runtime if they mismatch in required ISAs or // computed layouts of structs. Thus we want to ensure that usage // of Vector<T> is only optimistic and doesn't hard code a dependency // that would cause the entire image to be invalidated. bool isVectorTOptimistic = true; (TargetArchitecture targetArchitecture, TargetOS targetOS, TargetAbi targetAbi) = Helpers.GetTargetSpec(Get(_command.TargetArchitecture), Get(_command.TargetOS)); bool targetAllowsRuntimeCodeGeneration = GetTargetAllowsRuntimeCodeGeneration(targetOS, targetArchitecture); // Crossgen2 is partial AOT and its pre-compiled methods can be thrown away at runtime if // they mismatch in required ISAs or computed layouts of structs. On targets that allow // runtime code generation we keep Vector<T> usage optimistic so we never hard code a // dependency that could invalidate the entire image. On targets that do not allow // runtime code generation, we do not want an ISA mismatch to invalidate any code // in the image. There we make Vector<T> non-optimistic and hard code the ISA support // to avoid falling back to the interpreter. bool isVectorTOptimistic = targetAllowsRuntimeCodeGeneration; bool allowOptimistic = _command.OptimizationMode != OptimizationMode.PreferSize; if (targetOS is TargetOS.iOS or TargetOS.tvOS or TargetOS.iOSSimulator or TargetOS.tvOSSimulator or TargetOS.MacCatalyst or TargetOS.Browser or TargetOS.Wasi) if (!targetAllowsRuntimeCodeGeneration) { // These platforms do not support jitted code, so we want to ensure that we don't // need to fall back to the interpreter for any hardware-intrinsic optimizations. // Disable optimistic instruction sets by default. allowOptimistic = false; } InstructionSetSupport instructionSetSupport = Helpers.ConfigureInstructionSetSupport(Get(_command.InstructionSet), Get(_command.MaxVectorTBitWidth), isVectorTOptimistic, targetArchitecture, targetOS, SR.InstructionSetMustNotBe, SR.InstructionSetInvalidImplication, logger, allowOptimistic: allowOptimistic, isReadyToRun: true); if (!targetAllowsRuntimeCodeGeneration) { instructionSetSupport = Helpers.GetFixedInstructionSetSupport(instructionSetSupport); } SharedGenericsMode genericsMode = SharedGenericsMode.CanonicalReferenceTypes; var targetDetails = new TargetDetails(targetArchitecture, targetOS, targetAbi, instructionSetSupport.GetVectorTSimdVector()); Expand DownExpand Up @@ -142,6 +147,7 @@ public int Run() // Initialize type system context // _typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, versionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, instructionSetSupport, oldTypeSystemContext: null); Expand DownExpand Up @@ -286,6 +292,7 @@ public int Run() bool singleCompilationVersionBubbleIncludesCoreLib = versionBubbleIncludesCoreLib || (String.Compare(inputFile.Key, "System.Private.CoreLib", StringComparison.OrdinalIgnoreCase) == 0); typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, singleCompilationVersionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, _typeSystemContext.InstructionSetSupport, _typeSystemContext); typeSystemContext.InputFilePaths = singleCompilationInputFilePaths; Expand DownExpand Up @@ -700,6 +707,12 @@ private void RunSingleCompilation(Dictionary<string, string> inFilePaths, Instru } } private static bool GetTargetAllowsRuntimeCodeGeneration(TargetOS operatingSystem, TargetArchitecture architecture) { return operatingSystem is not (TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator or TargetOS.Browser or TargetOS.Wasi) && architecture is not TargetArchitecture.Wasm32; } private void CheckManagedCppInputFiles(IEnumerable<string> inputPaths) { foreach (string inputFilePath in inputPaths) Expand Down Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later. Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , '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 contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. dotnet /runtimePublic Notifications You must be signed in to change notification settings Fork 5.6k Star 18.2k Code Issues5k+ Pull requests563 Discussions Actions Projects Security and quality67 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights Preserve IL for CoreCLR interpreter fallback on Apple mobile#130622 New issue Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community. Sign up for GitHub By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails. Already on GitHub? Sign in to your account Merged kotlarmilos merged 22 commits into main from copilot/clr-ios-track-il-stripping-issuesJul 28, 2026 +181 −53 Conversation 98 Commits 22 Checks 193 Files changed 13 Merged Preserve IL for CoreCLR interpreter fallback on Apple mobile #130622 Show file tree Hide file tree Changes from all commits Commits Show all changes 22 commits Select commit Hold shift + click to select a range eacd9d2 Initial plan Copilot Jul 13, 2026f5f5cce Preserve IL for CoreCLR interpreter fallback Copilot Jul 13, 20267462331 Complete IL stripping validation Copilot Jul 13, 2026bbff0da Fix fixed ISA handling for stripped R2R images kotlarmilos Jul 14, 20267276e8a Merge main into IL stripping fixes kotlarmilos Jul 14, 20266f8d7a0 Potential fix for pull request finding kotlarmilos Jul 14, 202612d0b93 Potential fix for pull request finding kotlarmilos Jul 14, 20263b82391 Address fixed instruction set review feedback kotlarmilos Jul 15, 2026a4ce2cf Keep fixed ISA handling in crossgen2 kotlarmilos Jul 16, 20267729441 Restore existing CorInfo formatting kotlarmilos Jul 16, 2026ab2af53 Remove unrelated formatting changes kotlarmilos Jul 16, 2026027c501 Dedup fixed-instruction-set target check and relocate crossgen2 ISA h… kotlarmilos Jul 17, 2026c099887 Drop doc comment on IsFixedInstructionSetTarget for parity with surro… kotlarmilos Jul 17, 20268b8c810 Drop comment on GetFixedInstructionSetSupport for parity with surroun… kotlarmilos Jul 17, 20263309739 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 17, 20267d4fd8b Refactor crossgen2 fixed-instruction-set handling per review feedback kotlarmilos Jul 20, 20265c33a99 Fix Apple mobile ReadyToRun startup crash from baseline instruction-s… kotlarmilos Jul 20, 20264537bbc Drop explanatory comment on baseline signature unsupported-entry guard kotlarmilos Jul 20, 20269c231ea Move GetTargetAllowsRuntimeCodeGeneration into crossgen2 Program.cs kotlarmilos Jul 21, 2026c86b9e1 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 21, 2026fae3aeb Remove host-specific FEATURE_DYNAMIC_CODE_COMPILED gating from crossgen2 kotlarmilos Jul 22, 20267e1cc8d Remove dead FEATURE_DYNAMIC_CODE_COMPILED define from ILCompiler.Read… kotlarmilos Jul 22, 2026 File filter Filter by extension Filter by extension .cs (9) .csproj (4) All 2 file types selected Only manifest files Viewed files Clear filters Conversations Failed to load comments. Loading Uh oh! There was an error while loading. Please reload this page. Jump to Jump to file Failed to load files. Loading Uh oh! There was an error while loading. Please reload this page. Diff view Unified Split Hide whitespace Diff view Unified Split Hide whitespace src/coreclr/tools/Common/InstructionSetHelpers.cs InstructionSetHelpers.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs R2RTestSuites.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs StripILBodies.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs R2RResultChecker.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs ReadyToRunInstructionSetSupportSignature.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs ReadyToRunCodegenCompilation.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs ReadyToRunCompilerContext.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj ILCompiler.ReadyToRun.csproj src/coreclr/tools/aot/crossgen2/Program.cs Program.cs src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj System.IO.Hashing.Tests.csproj src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/SignatureDecoderTests.cs SignatureDecoderTests.cs src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj System.Reflection.Metadata.Tests.csproj src/tests/JIT/Regression/Regression_o_2.csproj Regression_o_2.csproj Some comments aren't visible on the classic Files Changed page. There are no files selected for viewing 31 changes: 31 additions & 0 deletions 31 src/coreclr/tools/Common/InstructionSetHelpers.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -11,6 +11,7 @@ using Internal.TypeSystem; using InstructionSet = Internal.JitInterface.InstructionSet; using InstructionSetFlags = Internal.JitInterface.InstructionSetFlags; namespace System.CommandLine { Expand DownExpand Up @@ -353,5 +354,35 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru InstructionSetSupportBuilder.GetNonSpecifiableInstructionSetsForArch(targetArchitecture), targetArchitecture); } // Produces an InstructionSetSupport where the instruction sets are fixed at compile time: every // specifiable instruction set that is not already supported is marked explicitly unsupported, and the // supported sets are also treated as optimistic. This is used for targets without runtime code generation // (for example Apple mobile and WASM), where the pre-compiled code must hard code its ISA usage because // there is no JIT to recover from an instruction set mismatch. public static InstructionSetSupport GetFixedInstructionSetSupport(InstructionSetSupport instructionSetSupport) Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. { InstructionSetFlags unsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags; foreach (var instructionSetInfo in InstructionSetFlags.ArchitectureToValidInstructionSets(instructionSetSupport.Architecture)) { if (instructionSetInfo.Specifiable && !instructionSetSupport.IsInstructionSetSupported(instructionSetInfo.InstructionSet)) { unsupportedInstructionSets.AddInstructionSet(instructionSetInfo.InstructionSet); } } unsupportedInstructionSets.ExpandInstructionSetByReverseImplication(instructionSetSupport.Architecture); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. unsupportedInstructionSets.Set64BitInstructionSetVariants(instructionSetSupport.Architecture); if (instructionSetSupport.Architecture is TargetArchitecture.X86 or TargetArchitecture.ARM) unsupportedInstructionSets.Set64BitInstructionSetVariantsUnconditionally(instructionSetSupport.Architecture); return new InstructionSetSupport( instructionSetSupport.SupportedFlags, unsupportedInstructionSets, instructionSetSupport.SupportedFlags, instructionSetSupport.NonSpecifiableFlags, instructionSetSupport.Architecture); } } } 46 changes: 46 additions & 0 deletions 46 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -570,6 +570,7 @@ public void RuntimeAsyncStripILBodiesPreservesTaskReturningIL() new(nameof(RuntimeAsyncStripILBodiesPreservesTaskReturningIL), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetarch:x64"], Validate = Validate, }, ])); Expand All @@ -593,6 +594,7 @@ static void Validate(ReadyToRunReader reader) Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "ComputeTag", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "Root", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncTaskMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncValueTaskMethod", out diag), diag); Expand All @@ -604,6 +606,50 @@ static void Validate(ReadyToRunReader reader) } } [Fact] public void AppleMobileStripILBodiesUsesFixedInstructionSet() { var stripILBodies = new CompiledAssembly { AssemblyName = nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), SourceResourceNames = [ "RuntimeAsync/StripILBodies.cs", "RuntimeAsync/RuntimeAsyncMethodGenerationAttribute.cs", ], Features = { RuntimeAsyncFeature }, }; new R2RTestRunner(_output).Run(new R2RTestCase( nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [ new(nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetos:ios", "--targetarch:arm64"], Validate = Validate, }, ])); static void Validate(ReadyToRunReader reader) { string componentFile = Path.Combine( Path.GetDirectoryName(reader.Filename)!, nameof(AppleMobileStripILBodiesUsesFixedInstructionSet) + ".dll"); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out string diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.False( R2RAssert.HasFixupKindOnMethod( reader, ReadyToRunFixupKind.Check_InstructionSetSupport, ".UsesRuntimeCheckedInstructionSet(", out diag), diag); Assert.True(R2RAssert.EagerInstructionSetSupportHasNoUnsupportedEntries(reader, out diag), diag); } } /// <summary> /// PR #123643: Async methods capturing GC refs across await points /// produce ContinuationLayout fixups encoding the GC ref map. Expand Down 9 changes: 9 additions & 0 deletions 9 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -8,6 +8,9 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; using ArmAes = System.Runtime.Intrinsics.Arm.Aes; using X86Aes = System.Runtime.Intrinsics.X86.Aes; public static class StripILBodies { [MethodImpl(MethodImplOptions.NoInlining)] Expand DownExpand Up @@ -82,6 +85,12 @@ public static int PlainStrippableMethod(int a, int b) return a + b + ComputeTag(); } [MethodImpl(MethodImplOptions.NoInlining)] public static bool UsesRuntimeCheckedInstructionSet() { return X86Aes.IsSupported || ArmAes.IsSupported || ArmAes.Arm64.IsSupported; } [MethodImpl(MethodImplOptions.NoInlining)] private static int ComputeTag() { Expand Down 41 changes: 41 additions & 0 deletions 41 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -954,6 +954,47 @@ public static bool HasFixupKindCountOnMethod(ReadyToRunReader reader, ReadyToRun return true; } /// <summary> /// Returns true if the global eager baseline <see cref="ReadyToRunFixupKind.Check_InstructionSetSupport"/> /// fixup does not assert that any instruction set must be absent at runtime ("must be absent" entries render /// with a <c>-</c> suffix; supported entries use <c>+</c>). Targets that cannot generate code at runtime must /// not encode these assertions, as a failing eager fixup fatally disables all ReadyToRun code with no JIT fallback. /// </summary> Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. public static bool EagerInstructionSetSupportHasNoUnsupportedEntries(ReadyToRunReader reader, out string diagnostic) { var options = new SignatureFormattingOptions(); var signatures = new List<string>(); foreach (ReadyToRunImportSection section in reader.ImportSections) { if (section.Entries is null) continue; Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. foreach (ReadyToRunImportSection.ImportSectionEntry entry in section.Entries) { if (entry.Signature is not null && entry.Signature.FixupKind == ReadyToRunFixupKind.Check_InstructionSetSupport) signatures.Add(entry.Signature.ToString(options)); } } if (signatures.Count == 0) { diagnostic = "Expected a global Check_InstructionSetSupport eager fixup, but none was found."; return false; } var withUnsupported = signatures.Where(s => s.Contains('-')).ToList(); if (withUnsupported.Count > 0) { diagnostic = "Global Check_InstructionSetSupport fixup must not assert any instruction set is absent " + $"on no-JIT targets, but found: [{string.Join(", ", withUnsupported)}]"; return false; } diagnostic = $"Global Check_InstructionSetSupport fixup asserts only supported instruction sets: [{string.Join(", ", signatures)}]"; return true; } /// <summary> /// Returns true if the R2R image contains at least one fixup of the given kind. /// </summary> Expand Down 30 changes: 17 additions & 13 deletions 30 ...yToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -15,13 +15,11 @@ public class ReadyToRunInstructionSetSupportSignature : Signature { string _instructionSetsSupport; public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport) public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport, bool emitExplicitlyUnsupported = true) { StringBuilder builder = new StringBuilder(); InstructionSet[] supportedInstructionSets = instructionSetSupport.SupportedFlags.ToArray(); Array.Sort(supportedInstructionSets); InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); bool addDelimiter = false; var r2rAlreadyEmitted = new HashSet<ReadyToRunInstructionSet>(); Expand All @@ -43,19 +41,25 @@ public static string ToInstructionSetSupportString(InstructionSetSupport instruc builder.Append(','); r2rAlreadyEmitted.Clear(); addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) if (emitExplicitlyUnsupported) { var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); } } } Expand Down 7 changes: 5 additions & 2 deletions 7 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -382,8 +382,11 @@ internal ReadyToRunCodegenCompilation( CompilationModuleGroup = (ReadyToRunCompilationModuleGroupBase)nodeFactory.CompilationModuleGroup; // Generate baseline support specification for InstructionSetSupport. This will prevent usage of the generated // code if the runtime environment doesn't support the specified instruction set string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport); // code if the runtime environment doesn't support the specified instruction set. Targets that cannot generate // code at runtime must not encode "must be absent" assertions, since a failing eager fixup is a fatal startup // error with no JIT fallback (see ToInstructionSetSupportString). Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. bool targetAllowsRuntimeCodeGeneration = ((ReadyToRunCompilerContext)nodeFactory.TypeSystemContext).TargetAllowsRuntimeCodeGeneration; string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport, emitExplicitlyUnsupported: targetAllowsRuntimeCodeGeneration); ReadyToRunInstructionSetSupportSignature instructionSetSupportSig = new ReadyToRunInstructionSetSupportSignature(instructionSetSupportString); _dependencyGraph.AddRoot(new Import(NodeFactory.EagerImports, instructionSetSupportSig), "Baseline instruction set support"); Expand Down 24 changes: 3 additions & 21 deletions 24 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -58,11 +58,13 @@ public ReadyToRunCompilerContext( TargetDetails details, SharedGenericsMode genericsMode, bool bubbleIncludesCoreModule, bool targetAllowsRuntimeCodeGeneration, InstructionSetSupport instructionSetSupport, CompilerTypeSystemContext oldTypeSystemContext) : base(details, genericsMode) { BubbleIncludesCoreModule = bubbleIncludesCoreModule; TargetAllowsRuntimeCodeGeneration = targetAllowsRuntimeCodeGeneration; InstructionSetSupport = instructionSetSupport; _r2rFieldLayoutAlgorithm = new ReadyToRunMetadataFieldLayoutAlgorithm(); _systemObjectFieldLayoutAlgorithm = new SystemObjectFieldLayoutAlgorithm(_r2rFieldLayoutAlgorithm); Expand DownExpand Up @@ -99,27 +101,7 @@ public ReadyToRunCompilerContext( public InstructionSetSupport InstructionSetSupport { get; } public bool TargetAllowsRuntimeCodeGeneration { get { #if FEATURE_DYNAMIC_CODE_COMPILED if (Target.OperatingSystem is TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator) { return false; } if (Target.Architecture is TargetArchitecture.Wasm32) { return false; } return true; #else return false; #endif } } public bool TargetAllowsRuntimeCodeGeneration { get; } public override FieldLayoutAlgorithm GetLayoutAlgorithmForType(DefType type) { Expand Down 1 change: 0 additions & 1 deletion 1 src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -5,7 +5,6 @@ <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants> <DefineConstants Condition="'$(FeatureDynamicCodeCompiled)' == 'true'">$(DefineConstants);FEATURE_DYNAMIC_CODE_COMPILED</DefineConstants> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Platforms>x64;x86;arm;arm64</Platforms> <PlatformTarget>AnyCPU</PlatformTarget> Expand Down 35 changes: 24 additions & 11 deletions 35 src/coreclr/tools/aot/crossgen2/Program.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -76,29 +76,34 @@ public int Run() var logger = new Logger(Console.Out, Get(_command.IsVerbose)); // Crossgen2 is partial AOT and its pre-compiled methods can be // thrown away at runtime if they mismatch in required ISAs or // computed layouts of structs. Thus we want to ensure that usage // of Vector<T> is only optimistic and doesn't hard code a dependency // that would cause the entire image to be invalidated. bool isVectorTOptimistic = true; (TargetArchitecture targetArchitecture, TargetOS targetOS, TargetAbi targetAbi) = Helpers.GetTargetSpec(Get(_command.TargetArchitecture), Get(_command.TargetOS)); bool targetAllowsRuntimeCodeGeneration = GetTargetAllowsRuntimeCodeGeneration(targetOS, targetArchitecture); // Crossgen2 is partial AOT and its pre-compiled methods can be thrown away at runtime if // they mismatch in required ISAs or computed layouts of structs. On targets that allow // runtime code generation we keep Vector<T> usage optimistic so we never hard code a // dependency that could invalidate the entire image. On targets that do not allow // runtime code generation, we do not want an ISA mismatch to invalidate any code // in the image. There we make Vector<T> non-optimistic and hard code the ISA support // to avoid falling back to the interpreter. bool isVectorTOptimistic = targetAllowsRuntimeCodeGeneration; bool allowOptimistic = _command.OptimizationMode != OptimizationMode.PreferSize; if (targetOS is TargetOS.iOS or TargetOS.tvOS or TargetOS.iOSSimulator or TargetOS.tvOSSimulator or TargetOS.MacCatalyst or TargetOS.Browser or TargetOS.Wasi) if (!targetAllowsRuntimeCodeGeneration) { // These platforms do not support jitted code, so we want to ensure that we don't // need to fall back to the interpreter for any hardware-intrinsic optimizations. // Disable optimistic instruction sets by default. allowOptimistic = false; } InstructionSetSupport instructionSetSupport = Helpers.ConfigureInstructionSetSupport(Get(_command.InstructionSet), Get(_command.MaxVectorTBitWidth), isVectorTOptimistic, targetArchitecture, targetOS, SR.InstructionSetMustNotBe, SR.InstructionSetInvalidImplication, logger, allowOptimistic: allowOptimistic, isReadyToRun: true); if (!targetAllowsRuntimeCodeGeneration) { instructionSetSupport = Helpers.GetFixedInstructionSetSupport(instructionSetSupport); } SharedGenericsMode genericsMode = SharedGenericsMode.CanonicalReferenceTypes; var targetDetails = new TargetDetails(targetArchitecture, targetOS, targetAbi, instructionSetSupport.GetVectorTSimdVector()); Expand DownExpand Up @@ -142,6 +147,7 @@ public int Run() // Initialize type system context // _typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, versionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, instructionSetSupport, oldTypeSystemContext: null); Expand DownExpand Up @@ -286,6 +292,7 @@ public int Run() bool singleCompilationVersionBubbleIncludesCoreLib = versionBubbleIncludesCoreLib || (String.Compare(inputFile.Key, "System.Private.CoreLib", StringComparison.OrdinalIgnoreCase) == 0); typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, singleCompilationVersionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, _typeSystemContext.InstructionSetSupport, _typeSystemContext); typeSystemContext.InputFilePaths = singleCompilationInputFilePaths; Expand DownExpand Up @@ -700,6 +707,12 @@ private void RunSingleCompilation(Dictionary<string, string> inFilePaths, Instru } } private static bool GetTargetAllowsRuntimeCodeGeneration(TargetOS operatingSystem, TargetArchitecture architecture) { return operatingSystem is not (TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator or TargetOS.Browser or TargetOS.Wasi) && architecture is not TargetArchitecture.Wasm32; } private void CheckManagedCppInputFiles(IEnumerable<string> inputPaths) { foreach (string inputFilePath in inputPaths) Expand Down Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later. Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time. , '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 contentNavigation Menu Sign inAppearance settings AI CODE CREATIONGitHub CopilotWrite better code with AI GitHub Copilot appDirect agents from issue to merge MCP RegistryIntegrate external tools DEVELOPER WORKFLOWSActionsAutomate any workflow CodespacesInstant dev environments IssuesPlan and track work Code ReviewManage code changes Code QualityEnforce quality at merge APPLICATION SECURITYGitHub Advanced SecurityFind and fix vulnerabilities Code securitySecure your code as you build Secret protectionStop leaks before they start EXPLOREWhy GitHub Documentation Blog Changelog Marketplace View all features BY COMPANY SIZEEnterprises Small and medium teams Startups Nonprofits BY USE CASEApp Modernization DevSecOps DevOps CI/CD View all use cases BY INDUSTRYHealthcare Financial services Manufacturing Government View all industries View all solutions EXPLORE BY TOPICAI Software Development DevOps Security View all topics EXPLORE BY TYPECustomer stories Events & webinars Ebooks & reports Business insights GitHub Skills SUPPORT & SERVICESDocumentation Customer support Community forum Trust center Partners View all resources COMMUNITYGitHub SponsorsFund open source developers PROGRAMSSecurity Lab Maintainer Community GitHub Stars Archive Program REPOSITORIESTopics Trending Collections ENTERPRISE SOLUTIONSEnterprise platformAI-powered developer platform AVAILABLE ADD-ONSGitHub Advanced SecurityEnterprise-grade security features Copilot for BusinessEnterprise-grade AI features Premium SupportEnterprise-grade 24/7 support Pricing Sign in Sign upAppearance settings You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert Uh oh! There was an error while loading. Please reload this page. dotnet /runtimePublic Notifications You must be signed in to change notification settings Fork 5.6k Star 18.2k Code Issues5k+ Pull requests563 Discussions Actions Projects Security and quality67 Insights Additional navigation options Code Issues Pull requests Discussions Actions Projects Security and quality Insights Preserve IL for CoreCLR interpreter fallback on Apple mobile#130622 New issue Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community. Sign up for GitHub By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails. Already on GitHub? Sign in to your account Merged kotlarmilos merged 22 commits into main from copilot/clr-ios-track-il-stripping-issuesJul 28, 2026 +181 −53 Conversation 98 Commits 22 Checks 193 Files changed 13 Merged Preserve IL for CoreCLR interpreter fallback on Apple mobile #130622 Show file tree Hide file tree Changes from all commits Commits Show all changes 22 commits Select commit Hold shift + click to select a range eacd9d2 Initial plan Copilot Jul 13, 2026f5f5cce Preserve IL for CoreCLR interpreter fallback Copilot Jul 13, 20267462331 Complete IL stripping validation Copilot Jul 13, 2026bbff0da Fix fixed ISA handling for stripped R2R images kotlarmilos Jul 14, 20267276e8a Merge main into IL stripping fixes kotlarmilos Jul 14, 20266f8d7a0 Potential fix for pull request finding kotlarmilos Jul 14, 202612d0b93 Potential fix for pull request finding kotlarmilos Jul 14, 20263b82391 Address fixed instruction set review feedback kotlarmilos Jul 15, 2026a4ce2cf Keep fixed ISA handling in crossgen2 kotlarmilos Jul 16, 20267729441 Restore existing CorInfo formatting kotlarmilos Jul 16, 2026ab2af53 Remove unrelated formatting changes kotlarmilos Jul 16, 2026027c501 Dedup fixed-instruction-set target check and relocate crossgen2 ISA h… kotlarmilos Jul 17, 2026c099887 Drop doc comment on IsFixedInstructionSetTarget for parity with surro… kotlarmilos Jul 17, 20268b8c810 Drop comment on GetFixedInstructionSetSupport for parity with surroun… kotlarmilos Jul 17, 20263309739 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 17, 20267d4fd8b Refactor crossgen2 fixed-instruction-set handling per review feedback kotlarmilos Jul 20, 20265c33a99 Fix Apple mobile ReadyToRun startup crash from baseline instruction-s… kotlarmilos Jul 20, 20264537bbc Drop explanatory comment on baseline signature unsupported-entry guard kotlarmilos Jul 20, 20269c231ea Move GetTargetAllowsRuntimeCodeGeneration into crossgen2 Program.cs kotlarmilos Jul 21, 2026c86b9e1 Merge branch 'main' into copilot/clr-ios-track-il-stripping-issues kotlarmilos Jul 21, 2026fae3aeb Remove host-specific FEATURE_DYNAMIC_CODE_COMPILED gating from crossgen2 kotlarmilos Jul 22, 20267e1cc8d Remove dead FEATURE_DYNAMIC_CODE_COMPILED define from ILCompiler.Read… kotlarmilos Jul 22, 2026 File filter Filter by extension Filter by extension .cs (9) .csproj (4) All 2 file types selected Only manifest files Viewed files Clear filters Conversations Failed to load comments. Loading Uh oh! There was an error while loading. Please reload this page. Jump to Jump to file Failed to load files. Loading Uh oh! There was an error while loading. Please reload this page. Diff view Unified Split Hide whitespace Diff view Unified Split Hide whitespace src/coreclr/tools/Common/InstructionSetHelpers.cs InstructionSetHelpers.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs R2RTestSuites.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs StripILBodies.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs R2RResultChecker.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs ReadyToRunInstructionSetSupportSignature.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs ReadyToRunCodegenCompilation.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs ReadyToRunCompilerContext.cs src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj ILCompiler.ReadyToRun.csproj src/coreclr/tools/aot/crossgen2/Program.cs Program.cs src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj System.IO.Hashing.Tests.csproj src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/SignatureDecoderTests.cs SignatureDecoderTests.cs src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj System.Reflection.Metadata.Tests.csproj src/tests/JIT/Regression/Regression_o_2.csproj Regression_o_2.csproj Some comments aren't visible on the classic Files Changed page. There are no files selected for viewing 31 changes: 31 additions & 0 deletions 31 src/coreclr/tools/Common/InstructionSetHelpers.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -11,6 +11,7 @@ using Internal.TypeSystem; using InstructionSet = Internal.JitInterface.InstructionSet; using InstructionSetFlags = Internal.JitInterface.InstructionSetFlags; namespace System.CommandLine { Expand DownExpand Up @@ -353,5 +354,35 @@ public static InstructionSetSupport ConfigureInstructionSetSupport(string instru InstructionSetSupportBuilder.GetNonSpecifiableInstructionSetsForArch(targetArchitecture), targetArchitecture); } // Produces an InstructionSetSupport where the instruction sets are fixed at compile time: every // specifiable instruction set that is not already supported is marked explicitly unsupported, and the // supported sets are also treated as optimistic. This is used for targets without runtime code generation // (for example Apple mobile and WASM), where the pre-compiled code must hard code its ISA usage because // there is no JIT to recover from an instruction set mismatch. public static InstructionSetSupport GetFixedInstructionSetSupport(InstructionSetSupport instructionSetSupport) Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. { InstructionSetFlags unsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags; foreach (var instructionSetInfo in InstructionSetFlags.ArchitectureToValidInstructionSets(instructionSetSupport.Architecture)) { if (instructionSetInfo.Specifiable && !instructionSetSupport.IsInstructionSetSupported(instructionSetInfo.InstructionSet)) { unsupportedInstructionSets.AddInstructionSet(instructionSetInfo.InstructionSet); } } unsupportedInstructionSets.ExpandInstructionSetByReverseImplication(instructionSetSupport.Architecture); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. unsupportedInstructionSets.Set64BitInstructionSetVariants(instructionSetSupport.Architecture); if (instructionSetSupport.Architecture is TargetArchitecture.X86 or TargetArchitecture.ARM) unsupportedInstructionSets.Set64BitInstructionSetVariantsUnconditionally(instructionSetSupport.Architecture); return new InstructionSetSupport( instructionSetSupport.SupportedFlags, unsupportedInstructionSets, instructionSetSupport.SupportedFlags, instructionSetSupport.NonSpecifiableFlags, instructionSetSupport.Architecture); } } } 46 changes: 46 additions & 0 deletions 46 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/R2RTestSuites.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -570,6 +570,7 @@ public void RuntimeAsyncStripILBodiesPreservesTaskReturningIL() new(nameof(RuntimeAsyncStripILBodiesPreservesTaskReturningIL), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetarch:x64"], Validate = Validate, }, ])); Expand All @@ -593,6 +594,7 @@ static void Validate(ReadyToRunReader reader) Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "ComputeTag", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "Root", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncTaskMethod", out diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "AsyncValueTaskMethod", out diag), diag); Expand All @@ -604,6 +606,50 @@ static void Validate(ReadyToRunReader reader) } } [Fact] public void AppleMobileStripILBodiesUsesFixedInstructionSet() { var stripILBodies = new CompiledAssembly { AssemblyName = nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), SourceResourceNames = [ "RuntimeAsync/StripILBodies.cs", "RuntimeAsync/RuntimeAsyncMethodGenerationAttribute.cs", ], Features = { RuntimeAsyncFeature }, }; new R2RTestRunner(_output).Run(new R2RTestCase( nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [ new(nameof(AppleMobileStripILBodiesUsesFixedInstructionSet), [new CrossgenAssembly(stripILBodies)]) { Options = [Crossgen2Option.Composite, Crossgen2Option.Optimize, Crossgen2Option.StripILBodies], AdditionalArgs = ["--targetos:ios", "--targetarch:arm64"], Validate = Validate, }, ])); static void Validate(ReadyToRunReader reader) { string componentFile = Path.Combine( Path.GetDirectoryName(reader.Filename)!, nameof(AppleMobileStripILBodiesUsesFixedInstructionSet) + ".dll"); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "PlainStrippableMethod", out string diag), diag); Assert.True(R2RAssert.MethodILIsStripped(componentFile, "StripILBodies", "UsesRuntimeCheckedInstructionSet", out diag), diag); Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. Assert.False( R2RAssert.HasFixupKindOnMethod( reader, ReadyToRunFixupKind.Check_InstructionSetSupport, ".UsesRuntimeCheckedInstructionSet(", out diag), diag); Assert.True(R2RAssert.EagerInstructionSetSupportHasNoUnsupportedEntries(reader, out diag), diag); } } /// <summary> /// PR #123643: Async methods capturing GC refs across await points /// produce ContinuationLayout fixups encoding the GC ref map. Expand Down 9 changes: 9 additions & 0 deletions 9 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCases/RuntimeAsync/StripILBodies.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -8,6 +8,9 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; using ArmAes = System.Runtime.Intrinsics.Arm.Aes; using X86Aes = System.Runtime.Intrinsics.X86.Aes; public static class StripILBodies { [MethodImpl(MethodImplOptions.NoInlining)] Expand DownExpand Up @@ -82,6 +85,12 @@ public static int PlainStrippableMethod(int a, int b) return a + b + ComputeTag(); } [MethodImpl(MethodImplOptions.NoInlining)] public static bool UsesRuntimeCheckedInstructionSet() { return X86Aes.IsSupported || ArmAes.IsSupported || ArmAes.Arm64.IsSupported; } [MethodImpl(MethodImplOptions.NoInlining)] private static int ComputeTag() { Expand Down 41 changes: 41 additions & 0 deletions 41 src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/TestCasesRunner/R2RResultChecker.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -954,6 +954,47 @@ public static bool HasFixupKindCountOnMethod(ReadyToRunReader reader, ReadyToRun return true; } /// <summary> /// Returns true if the global eager baseline <see cref="ReadyToRunFixupKind.Check_InstructionSetSupport"/> /// fixup does not assert that any instruction set must be absent at runtime ("must be absent" entries render /// with a <c>-</c> suffix; supported entries use <c>+</c>). Targets that cannot generate code at runtime must /// not encode these assertions, as a failing eager fixup fatally disables all ReadyToRun code with no JIT fallback. /// </summary> Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. public static bool EagerInstructionSetSupportHasNoUnsupportedEntries(ReadyToRunReader reader, out string diagnostic) { var options = new SignatureFormattingOptions(); var signatures = new List<string>(); foreach (ReadyToRunImportSection section in reader.ImportSections) { if (section.Entries is null) continue; Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. foreach (ReadyToRunImportSection.ImportSectionEntry entry in section.Entries) { if (entry.Signature is not null && entry.Signature.FixupKind == ReadyToRunFixupKind.Check_InstructionSetSupport) signatures.Add(entry.Signature.ToString(options)); } } if (signatures.Count == 0) { diagnostic = "Expected a global Check_InstructionSetSupport eager fixup, but none was found."; return false; } var withUnsupported = signatures.Where(s => s.Contains('-')).ToList(); if (withUnsupported.Count > 0) { diagnostic = "Global Check_InstructionSetSupport fixup must not assert any instruction set is absent " + $"on no-JIT targets, but found: [{string.Join(", ", withUnsupported)}]"; return false; } diagnostic = $"Global Check_InstructionSetSupport fixup asserts only supported instruction sets: [{string.Join(", ", signatures)}]"; return true; } /// <summary> /// Returns true if the R2R image contains at least one fixup of the given kind. /// </summary> Expand Down 30 changes: 17 additions & 13 deletions 30 ...yToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -15,13 +15,11 @@ public class ReadyToRunInstructionSetSupportSignature : Signature { string _instructionSetsSupport; public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport) public static string ToInstructionSetSupportString(InstructionSetSupport instructionSetSupport, bool emitExplicitlyUnsupported = true) { StringBuilder builder = new StringBuilder(); InstructionSet[] supportedInstructionSets = instructionSetSupport.SupportedFlags.ToArray(); Array.Sort(supportedInstructionSets); InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); bool addDelimiter = false; var r2rAlreadyEmitted = new HashSet<ReadyToRunInstructionSet>(); Expand All @@ -43,19 +41,25 @@ public static string ToInstructionSetSupportString(InstructionSetSupport instruc builder.Append(','); r2rAlreadyEmitted.Clear(); addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) if (emitExplicitlyUnsupported) { var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; InstructionSet[] explicitlyUnsupportedInstructionSets = instructionSetSupport.ExplicitlyUnsupportedFlags.ToArray(); Array.Sort(explicitlyUnsupportedInstructionSets); if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) addDelimiter = false; foreach (var instructionSetUnsupported in explicitlyUnsupportedInstructionSets) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); var r2rInstructionSet = instructionSetUnsupported.R2RInstructionSet(instructionSetSupport.Architecture); if (r2rInstructionSet == null) continue; if (r2rAlreadyEmitted.Add(r2rInstructionSet.Value)) { if (addDelimiter) builder.Append('-'); addDelimiter = true; builder.Append(r2rInstructionSet.Value.ToString()); } } } Expand Down 7 changes: 5 additions & 2 deletions 7 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -382,8 +382,11 @@ internal ReadyToRunCodegenCompilation( CompilationModuleGroup = (ReadyToRunCompilationModuleGroupBase)nodeFactory.CompilationModuleGroup; // Generate baseline support specification for InstructionSetSupport. This will prevent usage of the generated // code if the runtime environment doesn't support the specified instruction set string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport); // code if the runtime environment doesn't support the specified instruction set. Targets that cannot generate // code at runtime must not encode "must be absent" assertions, since a failing eager fixup is a fatal startup // error with no JIT fallback (see ToInstructionSetSupportString). Comment threadkotlarmilos marked this conversation as resolved. Uh oh! There was an error while loading. Please reload this page. bool targetAllowsRuntimeCodeGeneration = ((ReadyToRunCompilerContext)nodeFactory.TypeSystemContext).TargetAllowsRuntimeCodeGeneration; string instructionSetSupportString = ReadyToRunInstructionSetSupportSignature.ToInstructionSetSupportString(instructionSetSupport, emitExplicitlyUnsupported: targetAllowsRuntimeCodeGeneration); ReadyToRunInstructionSetSupportSignature instructionSetSupportSig = new ReadyToRunInstructionSetSupportSignature(instructionSetSupportString); _dependencyGraph.AddRoot(new Import(NodeFactory.EagerImports, instructionSetSupportSig), "Baseline instruction set support"); Expand Down 24 changes: 3 additions & 21 deletions 24 src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilerContext.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -58,11 +58,13 @@ public ReadyToRunCompilerContext( TargetDetails details, SharedGenericsMode genericsMode, bool bubbleIncludesCoreModule, bool targetAllowsRuntimeCodeGeneration, InstructionSetSupport instructionSetSupport, CompilerTypeSystemContext oldTypeSystemContext) : base(details, genericsMode) { BubbleIncludesCoreModule = bubbleIncludesCoreModule; TargetAllowsRuntimeCodeGeneration = targetAllowsRuntimeCodeGeneration; InstructionSetSupport = instructionSetSupport; _r2rFieldLayoutAlgorithm = new ReadyToRunMetadataFieldLayoutAlgorithm(); _systemObjectFieldLayoutAlgorithm = new SystemObjectFieldLayoutAlgorithm(_r2rFieldLayoutAlgorithm); Expand DownExpand Up @@ -99,27 +101,7 @@ public ReadyToRunCompilerContext( public InstructionSetSupport InstructionSetSupport { get; } public bool TargetAllowsRuntimeCodeGeneration { get { #if FEATURE_DYNAMIC_CODE_COMPILED if (Target.OperatingSystem is TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator) { return false; } if (Target.Architecture is TargetArchitecture.Wasm32) { return false; } return true; #else return false; #endif } } public bool TargetAllowsRuntimeCodeGeneration { get; } public override FieldLayoutAlgorithm GetLayoutAlgorithmForType(DefType type) { Expand Down 1 change: 0 additions & 1 deletion 1 src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -5,7 +5,6 @@ <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants> <DefineConstants Condition="'$(FeatureDynamicCodeCompiled)' == 'true'">$(DefineConstants);FEATURE_DYNAMIC_CODE_COMPILED</DefineConstants> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Platforms>x64;x86;arm;arm64</Platforms> <PlatformTarget>AnyCPU</PlatformTarget> Expand Down 35 changes: 24 additions & 11 deletions 35 src/coreclr/tools/aot/crossgen2/Program.cs Show comments View file Open in desktop Original file line number Diff line number Diff line change Expand Up @@ -76,29 +76,34 @@ public int Run() var logger = new Logger(Console.Out, Get(_command.IsVerbose)); // Crossgen2 is partial AOT and its pre-compiled methods can be // thrown away at runtime if they mismatch in required ISAs or // computed layouts of structs. Thus we want to ensure that usage // of Vector<T> is only optimistic and doesn't hard code a dependency // that would cause the entire image to be invalidated. bool isVectorTOptimistic = true; (TargetArchitecture targetArchitecture, TargetOS targetOS, TargetAbi targetAbi) = Helpers.GetTargetSpec(Get(_command.TargetArchitecture), Get(_command.TargetOS)); bool targetAllowsRuntimeCodeGeneration = GetTargetAllowsRuntimeCodeGeneration(targetOS, targetArchitecture); // Crossgen2 is partial AOT and its pre-compiled methods can be thrown away at runtime if // they mismatch in required ISAs or computed layouts of structs. On targets that allow // runtime code generation we keep Vector<T> usage optimistic so we never hard code a // dependency that could invalidate the entire image. On targets that do not allow // runtime code generation, we do not want an ISA mismatch to invalidate any code // in the image. There we make Vector<T> non-optimistic and hard code the ISA support // to avoid falling back to the interpreter. bool isVectorTOptimistic = targetAllowsRuntimeCodeGeneration; bool allowOptimistic = _command.OptimizationMode != OptimizationMode.PreferSize; if (targetOS is TargetOS.iOS or TargetOS.tvOS or TargetOS.iOSSimulator or TargetOS.tvOSSimulator or TargetOS.MacCatalyst or TargetOS.Browser or TargetOS.Wasi) if (!targetAllowsRuntimeCodeGeneration) { // These platforms do not support jitted code, so we want to ensure that we don't // need to fall back to the interpreter for any hardware-intrinsic optimizations. // Disable optimistic instruction sets by default. allowOptimistic = false; } InstructionSetSupport instructionSetSupport = Helpers.ConfigureInstructionSetSupport(Get(_command.InstructionSet), Get(_command.MaxVectorTBitWidth), isVectorTOptimistic, targetArchitecture, targetOS, SR.InstructionSetMustNotBe, SR.InstructionSetInvalidImplication, logger, allowOptimistic: allowOptimistic, isReadyToRun: true); if (!targetAllowsRuntimeCodeGeneration) { instructionSetSupport = Helpers.GetFixedInstructionSetSupport(instructionSetSupport); } SharedGenericsMode genericsMode = SharedGenericsMode.CanonicalReferenceTypes; var targetDetails = new TargetDetails(targetArchitecture, targetOS, targetAbi, instructionSetSupport.GetVectorTSimdVector()); Expand DownExpand Up @@ -142,6 +147,7 @@ public int Run() // Initialize type system context // _typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, versionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, instructionSetSupport, oldTypeSystemContext: null); Expand DownExpand Up @@ -286,6 +292,7 @@ public int Run() bool singleCompilationVersionBubbleIncludesCoreLib = versionBubbleIncludesCoreLib || (String.Compare(inputFile.Key, "System.Private.CoreLib", StringComparison.OrdinalIgnoreCase) == 0); typeSystemContext = new ReadyToRunCompilerContext(targetDetails, genericsMode, singleCompilationVersionBubbleIncludesCoreLib, targetAllowsRuntimeCodeGeneration, _typeSystemContext.InstructionSetSupport, _typeSystemContext); typeSystemContext.InputFilePaths = singleCompilationInputFilePaths; Expand DownExpand Up @@ -700,6 +707,12 @@ private void RunSingleCompilation(Dictionary<string, string> inFilePaths, Instru } } private static bool GetTargetAllowsRuntimeCodeGeneration(TargetOS operatingSystem, TargetArchitecture architecture) { return operatingSystem is not (TargetOS.iOS or TargetOS.iOSSimulator or TargetOS.MacCatalyst or TargetOS.tvOS or TargetOS.tvOSSimulator or TargetOS.Browser or TargetOS.Wasi) && architecture is not TargetArchitecture.Wasm32; } private void CheckManagedCppInputFiles(IEnumerable<string> inputPaths) { foreach (string inputFilePath in inputPaths) Expand Down Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Loading Oops, something went wrong. Uh oh! There was an error while loading. Please reload this page. Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later. Footer © 2026 GitHub, Inc. Footer navigation Terms Privacy Security Status Community Docs Contact You can’t perform that action at this time.