From b52d3f8c8e5e3b6faaca454f9163186836f5a818 Mon Sep 17 00:00:00 2001 From: David Wrighton Date: Thu, 7 Jul 2022 17:40:40 -0700 Subject: [PATCH 1/2] Use UnrelatedR2RCode flag when --compilebubblegenerics is specified --- .../Compiler/ReadyToRunCompilationModuleGroupBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs index 22a1efae2549d8..36fc3c762e2a63 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs @@ -123,7 +123,7 @@ public override ReadyToRunFlags GetReadyToRunFlags() { flags |= ReadyToRunFlags.READYTORUN_FLAG_MultiModuleVersionBubble; } - if (CompileAllPossibleCrossModuleCode) + if (CompileAllPossibleCrossModuleCode || CompileGenericDependenciesFromVersionBubbleModuleSet) { flags |= ReadyToRunFlags.READYTORUN_FLAG_UnrelatedR2RCode; } From 9e315171071558aa8d1c513b75efb14845c35700 Mon Sep 17 00:00:00 2001 From: David Wrighton Date: Fri, 8 Jul 2022 10:55:31 -0700 Subject: [PATCH 2/2] Fix build break --- .../Compiler/ReadyToRunCompilationModuleGroupBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs index 36fc3c762e2a63..9b8ab3d6d6debc 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs @@ -123,7 +123,7 @@ public override ReadyToRunFlags GetReadyToRunFlags() { flags |= ReadyToRunFlags.READYTORUN_FLAG_MultiModuleVersionBubble; } - if (CompileAllPossibleCrossModuleCode || CompileGenericDependenciesFromVersionBubbleModuleSet) + if (CompileAllPossibleCrossModuleCode || _compileGenericDependenciesFromVersionBubbleModuleSet) { flags |= ReadyToRunFlags.READYTORUN_FLAG_UnrelatedR2RCode; }