From 29e74b688648b6fc792239e4f917ab9bb827436b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Tue, 9 Apr 2024 10:11:45 +0200 Subject: [PATCH] Fix Windows x86 testing #100375 broke optimized Windows x86 runs. --- .../IL/ILImporter.Scanner.cs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs index 34f2c243d8d751..524261def1a05b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs @@ -1230,12 +1230,16 @@ private void ImportBinaryOperation(ILOpcode opcode) break; case ILOpcode.div: case ILOpcode.div_un: - if (_compilation.TypeSystemContext.Target.Architecture == TargetArchitecture.ARM) + if (_compilation.TypeSystemContext.Target.Architecture is TargetArchitecture.ARM or TargetArchitecture.X86) { _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.ULDiv), "_uldiv"); _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.LDiv), "_ldiv"); - _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.UDiv), "_udiv"); - _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Div), "_div"); + + if (_compilation.TypeSystemContext.Target.Architecture is TargetArchitecture.ARM) + { + _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.UDiv), "_udiv"); + _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Div), "_div"); + } } else if (_compilation.TypeSystemContext.Target.Architecture == TargetArchitecture.ARM64) { @@ -1248,12 +1252,15 @@ private void ImportBinaryOperation(ILOpcode opcode) break; case ILOpcode.rem: case ILOpcode.rem_un: - if (_compilation.TypeSystemContext.Target.Architecture == TargetArchitecture.ARM) + if (_compilation.TypeSystemContext.Target.Architecture is TargetArchitecture.ARM or TargetArchitecture.X86) { _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.ULMod), "_ulmod"); _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.LMod), "_lmod"); - _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.UMod), "_umod"); - _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Mod), "_mod"); + if (_compilation.TypeSystemContext.Target.Architecture is TargetArchitecture.ARM) + { + _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.UMod), "_umod"); + _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Mod), "_mod"); + } } else if (_compilation.TypeSystemContext.Target.Architecture == TargetArchitecture.ARM64) {