From fbed4b9412446e83fdec63566ca179b2123dbfab Mon Sep 17 00:00:00 2001 From: David Wrighton Date: Thu, 29 Jul 2021 18:38:50 -0700 Subject: [PATCH] Remove requirement that --input-bubble be specified if an instruction set is specified (#56571) - This was here to protect against ABI breaking changes causing R2R misbehavior - We don't actually need this as if there is an ABI breaking change, we can detect it at runtime by looking at a combination of the R2R version and the required instruction sets encoded in the R2R image --- src/coreclr/tools/aot/crossgen2/Program.cs | 5 ----- src/coreclr/tools/aot/crossgen2/Properties/Resources.resx | 3 --- 2 files changed, 8 deletions(-) diff --git a/src/coreclr/tools/aot/crossgen2/Program.cs b/src/coreclr/tools/aot/crossgen2/Program.cs index 36b5bdd..d541851 100644 --- a/src/coreclr/tools/aot/crossgen2/Program.cs +++ b/src/coreclr/tools/aot/crossgen2/Program.cs @@ -235,11 +235,6 @@ namespace ILCompiler { List instructionSetParams = new List(); - // At this time, instruction sets may only be specified with --input-bubble, as - // we do not yet have a stable ABI for all vector parameter/return types. - if (!_commandLineOptions.InputBubble) - throw new CommandLineException(SR.InstructionSetWithoutInputBubble); - // Normalize instruction set format to include implied +. string[] instructionSetParamsInput = _commandLineOptions.InstructionSet.Split(","); for (int i = 0; i < instructionSetParamsInput.Length; i++) diff --git a/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx b/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx index 670f214..0eb8411 100644 --- a/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx +++ b/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx @@ -171,9 +171,6 @@ Instruction set '{0}' is not valid for this architecture and operating system - - Instruction set(s) specified without also specifying input-bubble - Instruction set '{0}' implies support for instruction set '{1}' -- 2.7.4