From d86b184ade4c8a10418eaecf3f790e383b7b83eb Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 13:25:13 +0200 Subject: [PATCH 01/18] Switch checked coreclr + libraries tests configs around in PRs --- eng/pipelines/runtime.yml | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index d23cb3c7550a3d..3b063edf50848c 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -1115,8 +1115,23 @@ jobs: eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(variables['isRollingBuild'], true)) +# The next three jobs run checked coreclr + libraries tests. +# The matrix looks like the following, where the right columns specify which configurations +# the libraries tests are built in. +# ________________________________________ +# | Platform | PR | Rolling | +# | ---------------- | --- | ------- | +# | linux-musl-arm64 | Debug | Release | +# | linux-arm | Debug | Release | +# | windows-x86 | Debug | Release | +# | Linux-musl-x64 | Debug | Release | +# | Linux-musl-arm | Release | Release | +# | Linux-x64 | Release | Release | +# | Windows-x64 | Release | Release | +# | OSX-x64 | Debug | Release | + # -# Libraries Test Execution against a checked runtime +# Debug (PR) / Release (rolling) Libraries Test Execution against a checked runtime # Only when the PR contains a coreclr change # - template: /eng/pipelines/common/platform-matrix.yml @@ -1124,11 +1139,10 @@ jobs: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - # - windows_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed. - - Linux_arm - - Linux_musl_arm - Linux_musl_arm64 + - Linux_arm - windows_x86 + - Linux_musl_x64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: @@ -1140,17 +1154,17 @@ jobs: eq(variables['isRollingBuild'], true)) # -# Libraries Test Execution against a checked runtime +# Release Libraries Test Execution against a checked runtime # Only if CoreCLR or Libraries is changed # - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/libraries/run-test-job.yml - buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + buildConfig: Release platforms: - - windows_x64 + - Linux_musl_arm - Linux_x64 - - Linux_musl_x64 + - windows_x64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: @@ -1176,4 +1190,4 @@ jobs: or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(variables['isRollingBuild'], true)) + eq(variables['isRollingBuild'], true)) \ No newline at end of file From bb13a7e7d9b8cccba8ef60f6a307520797181b7a Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 14:15:23 +0200 Subject: [PATCH 02/18] Random JIT change --- eng/pipelines/runtime.yml | 2 +- src/coreclr/jit/morph.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 3b063edf50848c..45dc3dcd3b426d 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -1120,7 +1120,7 @@ jobs: # the libraries tests are built in. # ________________________________________ # | Platform | PR | Rolling | -# | ---------------- | --- | ------- | +# | ---------------- | ------- | ------- | # | linux-musl-arm64 | Debug | Release | # | linux-arm | Debug | Release | # | windows-x86 | Debug | Release | diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp index 838b6f1076d4e0..a7971fc77106e6 100644 --- a/src/coreclr/jit/morph.cpp +++ b/src/coreclr/jit/morph.cpp @@ -4253,6 +4253,7 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg) } //------------------------------------------------------------------------ +// // fgMorphLclArgToFieldlist: Morph a GT_LCL_VAR node to a GT_FIELD_LIST of its promoted fields // // Arguments: From a39ff64fbece783561817be6680a4c31bb6ba49e Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 16:16:31 +0200 Subject: [PATCH 03/18] Do win-x86 debug builds for coreclr changes only --- eng/pipelines/runtime.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 45dc3dcd3b426d..2efabac4df3219 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -738,15 +738,11 @@ jobs: - OSX_x64 - windows_x64 - FreeBSD_x64 - - ${{ if eq(variables['isRollingBuild'], false) }}: - # we need to build windows_x86 for debug on PRs in order to test - # against a checked runtime when the PR contains coreclr changes - - windows_x86 jobParameters: testScope: innerloop # -# Libraries Build that only run when coreclr is changed +# Libraries debug build that only runs when coreclr is changed # Only do this on PR builds since we use the Release builds for these test runs in CI # and those are already built above # @@ -756,9 +752,10 @@ jobs: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Debug platforms: - - Linux_arm - - Linux_musl_arm - - Linux_musl_arm64 + - Linux_arm + - Linux_musl_arm + - Linux_musl_arm64 + - windows_x86 jobParameters: condition: >- eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true) From b922360546d7fcffd2cb41afc58068c7a31130fc Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 16:25:01 +0200 Subject: [PATCH 04/18] Delete Linux_musl_arm debug libraries build on coreclr changes --- eng/pipelines/runtime.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 2efabac4df3219..132eae720ffd02 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -753,7 +753,6 @@ jobs: buildConfig: Debug platforms: - Linux_arm - - Linux_musl_arm - Linux_musl_arm64 - windows_x86 jobParameters: From f993aea4651997086e465f78ffd626644ce26877 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 16:16:57 +0200 Subject: [PATCH 05/18] Build linux-x64 windows-x64 release libraries on coreclr changes --- eng/pipelines/runtime.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 132eae720ffd02..5d8589a47c5ce4 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -759,6 +759,22 @@ jobs: condition: >- eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true) +# +# Libraries release build that only runs when coreclr is changed in PRs +# We need these for checked coreclr + release libraries tests runs. +# +- ${{ if eq(variables['isRollingBuild'], false) }}: + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/libraries/build-job.yml + buildConfig: Release + platforms: + - Linux_x64 + - windows_x64 + jobParameters: + condition: >- + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true) + - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/libraries/build-job.yml From 212d9720c0fe589a79f4d85789887acb690eb7d2 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 16:28:54 +0200 Subject: [PATCH 06/18] Move Linux_musl_arm64 to release on PRs --- eng/pipelines/runtime.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 5d8589a47c5ce4..3ffdce0399fdfa 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -753,7 +753,6 @@ jobs: buildConfig: Debug platforms: - Linux_arm - - Linux_musl_arm64 - windows_x86 jobParameters: condition: >- @@ -815,7 +814,6 @@ jobs: parameters: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Linux_arm - Linux_musl_arm - Linux_musl_arm64 - windows_x86 @@ -829,6 +827,7 @@ jobs: parameters: buildConfig: Release platforms: + - Linux_arm - OSX_arm64 - OSX_x64 - Linux_x64 @@ -1133,14 +1132,14 @@ jobs: # ________________________________________ # | Platform | PR | Rolling | # | ---------------- | ------- | ------- | -# | linux-musl-arm64 | Debug | Release | # | linux-arm | Debug | Release | # | windows-x86 | Debug | Release | # | Linux-musl-x64 | Debug | Release | +# | OSX-x64 | Debug | Release | # | Linux-musl-arm | Release | Release | +# | linux-musl-arm64 | Release | Release | # | Linux-x64 | Release | Release | # | Windows-x64 | Release | Release | -# | OSX-x64 | Debug | Release | # # Debug (PR) / Release (rolling) Libraries Test Execution against a checked runtime @@ -1151,7 +1150,6 @@ jobs: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Linux_musl_arm64 - Linux_arm - windows_x86 - Linux_musl_x64 @@ -1175,6 +1173,7 @@ jobs: buildConfig: Release platforms: - Linux_musl_arm + - Linux_musl_arm64 - Linux_x64 - windows_x64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml From 9ce6df915548a2bb6b44d64bb7bf280b3ffea089 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 16:32:45 +0200 Subject: [PATCH 07/18] Switch linux-arm to linux-arm64 --- eng/pipelines/runtime.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 3ffdce0399fdfa..e712c8ab7385e5 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -752,7 +752,6 @@ jobs: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Debug platforms: - - Linux_arm - windows_x86 jobParameters: condition: >- @@ -819,6 +818,7 @@ jobs: - windows_x86 - windows_arm - windows_arm64 + - Linux_arm jobParameters: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: Release @@ -827,7 +827,6 @@ jobs: parameters: buildConfig: Release platforms: - - Linux_arm - OSX_arm64 - OSX_x64 - Linux_x64 @@ -1132,7 +1131,7 @@ jobs: # ________________________________________ # | Platform | PR | Rolling | # | ---------------- | ------- | ------- | -# | linux-arm | Debug | Release | +# | Linux-arm64 | Debug | Release | # | windows-x86 | Debug | Release | # | Linux-musl-x64 | Debug | Release | # | OSX-x64 | Debug | Release | @@ -1150,9 +1149,9 @@ jobs: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Linux_arm - windows_x86 - Linux_musl_x64 + - Linux_arm64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: From b6e7de8e9c4f891c74cde28895692d8658503204 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 16:34:51 +0200 Subject: [PATCH 08/18] Reorganize table --- eng/pipelines/runtime.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index e712c8ab7385e5..fd1904a6f87591 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -1131,14 +1131,14 @@ jobs: # ________________________________________ # | Platform | PR | Rolling | # | ---------------- | ------- | ------- | -# | Linux-arm64 | Debug | Release | +# | linux-arm64 | Debug | Release | # | windows-x86 | Debug | Release | -# | Linux-musl-x64 | Debug | Release | +# | linux-musl-x64 | Debug | Release | # | OSX-x64 | Debug | Release | -# | Linux-musl-arm | Release | Release | +# | linux-musl-arm | Release | Release | # | linux-musl-arm64 | Release | Release | -# | Linux-x64 | Release | Release | -# | Windows-x64 | Release | Release | +# | linux-x64 | Release | Release | +# | windows-x64 | Release | Release | # # Debug (PR) / Release (rolling) Libraries Test Execution against a checked runtime @@ -1149,9 +1149,9 @@ jobs: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: + - Linux_arm64 - windows_x86 - Linux_musl_x64 - - Linux_arm64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: From b27e1d781bf2f58b07c9fb30d6664d3ee44c8f79 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 19:51:29 +0200 Subject: [PATCH 09/18] Libraries change instead of jit change --- src/coreclr/jit/morph.cpp | 1 - .../src/System/Text/RegularExpressions/Regex.cs | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp index a7971fc77106e6..838b6f1076d4e0 100644 --- a/src/coreclr/jit/morph.cpp +++ b/src/coreclr/jit/morph.cpp @@ -4253,7 +4253,6 @@ GenTree* Compiler::fgMorphMultiregStructArg(CallArg* arg) } //------------------------------------------------------------------------ -// // fgMorphLclArgToFieldlist: Morph a GT_LCL_VAR node to a GT_FIELD_LIST of its promoted fields // // Arguments: diff --git a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs index 343e78be28f465..d65361c442644a 100644 --- a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs +++ b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs @@ -18,6 +18,7 @@ namespace System.Text.RegularExpressions /// Represents an immutable regular expression. Also contains static methods that /// allow use of regular expressions without instantiating a Regex explicitly. /// + /// public partial class Regex : ISerializable { [StringSyntax(StringSyntaxAttribute.Regex)] From 6bfd21c46f45eee17ced240f7d19ced6ad26c06b Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 21:32:34 +0200 Subject: [PATCH 10/18] Exclude runtime.yml from libraries/coreclr change evaluation temporarily --- eng/pipelines/common/evaluate-default-paths.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index b5effcf62675a8..90be843cd663cd 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -27,6 +27,7 @@ jobs: - eng/pipelines/installer/* - eng/pipelines/mono/* - eng/pipelines/libraries/* + - eng/pipelines/runtime.yml - subset: mono include: - src/libraries/System.Private.CoreLib/* @@ -64,6 +65,7 @@ jobs: - eng/pipelines/coreclr/* - eng/pipelines/mono/* - eng/pipelines/installer/* + - eng/pipelines/runtime.yml - subset: runtimetests include: - src/tests/* From 5a7591a79ab77eacdb31dccc1dc4e14385153714 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 21:35:27 +0200 Subject: [PATCH 11/18] Should have seen this one coming --- eng/pipelines/common/evaluate-default-paths.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 90be843cd663cd..f69ff539c60a18 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -28,6 +28,7 @@ jobs: - eng/pipelines/mono/* - eng/pipelines/libraries/* - eng/pipelines/runtime.yml + - eng/pipelines/common/evaluate-default-paths.yml - subset: mono include: - src/libraries/System.Private.CoreLib/* @@ -66,6 +67,7 @@ jobs: - eng/pipelines/mono/* - eng/pipelines/installer/* - eng/pipelines/runtime.yml + - eng/pipelines/common/evaluate-default-paths.yml - subset: runtimetests include: - src/tests/* From 01a0a3e1c5e9da7c840ecb23723d1f250719f32a Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Wed, 11 May 2022 22:33:26 +0200 Subject: [PATCH 12/18] Revert libraries change, make random coreclr change --- src/coreclr/jit/importer.cpp | 1 + .../src/System/Text/RegularExpressions/Regex.cs | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp index 7860d7742e7c9b..baf34e3bac2b27 100644 --- a/src/coreclr/jit/importer.cpp +++ b/src/coreclr/jit/importer.cpp @@ -17197,6 +17197,7 @@ GenTree* Compiler::impAssignMultiRegTypeToVar(GenTree* op, // Returns: // True if import was successful (may fail for some inlinees) // +// bool Compiler::impReturnInstruction(int prefixFlags, OPCODE& opcode) { const bool isTailCall = (prefixFlags & PREFIX_TAILCALL) != 0; diff --git a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs index d65361c442644a..343e78be28f465 100644 --- a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs +++ b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs @@ -18,7 +18,6 @@ namespace System.Text.RegularExpressions /// Represents an immutable regular expression. Also contains static methods that /// allow use of regular expressions without instantiating a Regex explicitly. /// - /// public partial class Regex : ISerializable { [StringSyntax(StringSyntaxAttribute.Regex)] From 1720e1dfdd59236ea896926b7eafb5b39b14e5a7 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Thu, 12 May 2022 10:54:10 +0200 Subject: [PATCH 13/18] Revert coreclr change, make random mono change --- src/coreclr/jit/importer.cpp | 1 - src/mono/mono/mini/mini.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp index baf34e3bac2b27..7860d7742e7c9b 100644 --- a/src/coreclr/jit/importer.cpp +++ b/src/coreclr/jit/importer.cpp @@ -17197,7 +17197,6 @@ GenTree* Compiler::impAssignMultiRegTypeToVar(GenTree* op, // Returns: // True if import was successful (may fail for some inlinees) // -// bool Compiler::impReturnInstruction(int prefixFlags, OPCODE& opcode) { const bool isTailCall = (prefixFlags & PREFIX_TAILCALL) != 0; diff --git a/src/mono/mono/mini/mini.c b/src/mono/mono/mini/mini.c index 34caa6a482e6a3..239ca934d60ab6 100644 --- a/src/mono/mono/mini/mini.c +++ b/src/mono/mono/mini/mini.c @@ -283,6 +283,7 @@ df_visit (MonoBasicBlock *start, int *dfn, MonoBasicBlock **array) } } +// guint32 mono_reverse_branch_op (guint32 opcode) { From 6dcc4d33b0cf2380ef79277f52e9c9d067cc529e Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Thu, 12 May 2022 11:00:27 +0200 Subject: [PATCH 14/18] Some more temporary exclude paths --- eng/pipelines/common/evaluate-default-paths.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index f69ff539c60a18..098e1406753ce8 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -50,6 +50,8 @@ jobs: - eng/pipelines/installer/* - eng/pipelines/coreclr/* - eng/pipelines/libraries/* + - eng/pipelines/runtime.yml + - eng/pipelines/common/evaluate-default-paths.yml - subset: libraries exclude: - eng/Version.Details.xml @@ -89,6 +91,8 @@ jobs: - eng/pipelines/coreclr/* - eng/pipelines/mono/* - eng/pipelines/libraries/* + - eng/pipelines/runtime.yml + - eng/pipelines/common/evaluate-default-paths.yml # We have limited Apple Silicon testing capacity # We want PR testing on a narrower set of changes # Specifically runtime directories which are higher risk of From bd305a85b0bb84a85fb3fed3b1d2d101c10a8e22 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Thu, 12 May 2022 17:19:01 +0200 Subject: [PATCH 15/18] Back to coreclr change --- src/coreclr/jit/importer.cpp | 2 +- src/mono/mono/mini/mini.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp index 7860d7742e7c9b..19b28e74cf6c02 100644 --- a/src/coreclr/jit/importer.cpp +++ b/src/coreclr/jit/importer.cpp @@ -113,7 +113,7 @@ inline void Compiler::impPushNullObjRefOnStack() // This method gets called when we run into unverifiable code // (and we are verifying the method) - +// inline void Compiler::verRaiseVerifyExceptionIfNeeded(INDEBUG(const char* msg) DEBUGARG(const char* file) DEBUGARG(unsigned line)) { diff --git a/src/mono/mono/mini/mini.c b/src/mono/mono/mini/mini.c index 239ca934d60ab6..34caa6a482e6a3 100644 --- a/src/mono/mono/mini/mini.c +++ b/src/mono/mono/mini/mini.c @@ -283,7 +283,6 @@ df_visit (MonoBasicBlock *start, int *dfn, MonoBasicBlock **array) } } -// guint32 mono_reverse_branch_op (guint32 opcode) { From 73c91a515c811ff03c2f4a1126dcc659cd8cf1a4 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Thu, 12 May 2022 19:44:23 +0200 Subject: [PATCH 16/18] Final libraries change try --- src/coreclr/jit/importer.cpp | 1 - .../src/System/Text/RegularExpressions/Regex.cs | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp index 19b28e74cf6c02..2cc6c7ad3e3010 100644 --- a/src/coreclr/jit/importer.cpp +++ b/src/coreclr/jit/importer.cpp @@ -113,7 +113,6 @@ inline void Compiler::impPushNullObjRefOnStack() // This method gets called when we run into unverifiable code // (and we are verifying the method) -// inline void Compiler::verRaiseVerifyExceptionIfNeeded(INDEBUG(const char* msg) DEBUGARG(const char* file) DEBUGARG(unsigned line)) { diff --git a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs index 343e78be28f465..d65361c442644a 100644 --- a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs +++ b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs @@ -18,6 +18,7 @@ namespace System.Text.RegularExpressions /// Represents an immutable regular expression. Also contains static methods that /// allow use of regular expressions without instantiating a Regex explicitly. /// + /// public partial class Regex : ISerializable { [StringSyntax(StringSyntaxAttribute.Regex)] From eeef30f4726be8f4faba3b70d6e2bbbbe9afa780 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Thu, 12 May 2022 19:44:58 +0200 Subject: [PATCH 17/18] Fix --- src/coreclr/jit/importer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp index 2cc6c7ad3e3010..7860d7742e7c9b 100644 --- a/src/coreclr/jit/importer.cpp +++ b/src/coreclr/jit/importer.cpp @@ -113,6 +113,7 @@ inline void Compiler::impPushNullObjRefOnStack() // This method gets called when we run into unverifiable code // (and we are verifying the method) + inline void Compiler::verRaiseVerifyExceptionIfNeeded(INDEBUG(const char* msg) DEBUGARG(const char* file) DEBUGARG(unsigned line)) { From 065416bf84147a9a4d26b7b980c65bae69e8cdf8 Mon Sep 17 00:00:00 2001 From: Jakob Botsch Nielsen Date: Fri, 13 May 2022 00:49:08 +0200 Subject: [PATCH 18/18] Revert changes for testing --- eng/pipelines/common/evaluate-default-paths.yml | 8 -------- .../src/System/Text/RegularExpressions/Regex.cs | 1 - 2 files changed, 9 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 098e1406753ce8..b5effcf62675a8 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -27,8 +27,6 @@ jobs: - eng/pipelines/installer/* - eng/pipelines/mono/* - eng/pipelines/libraries/* - - eng/pipelines/runtime.yml - - eng/pipelines/common/evaluate-default-paths.yml - subset: mono include: - src/libraries/System.Private.CoreLib/* @@ -50,8 +48,6 @@ jobs: - eng/pipelines/installer/* - eng/pipelines/coreclr/* - eng/pipelines/libraries/* - - eng/pipelines/runtime.yml - - eng/pipelines/common/evaluate-default-paths.yml - subset: libraries exclude: - eng/Version.Details.xml @@ -68,8 +64,6 @@ jobs: - eng/pipelines/coreclr/* - eng/pipelines/mono/* - eng/pipelines/installer/* - - eng/pipelines/runtime.yml - - eng/pipelines/common/evaluate-default-paths.yml - subset: runtimetests include: - src/tests/* @@ -91,8 +85,6 @@ jobs: - eng/pipelines/coreclr/* - eng/pipelines/mono/* - eng/pipelines/libraries/* - - eng/pipelines/runtime.yml - - eng/pipelines/common/evaluate-default-paths.yml # We have limited Apple Silicon testing capacity # We want PR testing on a narrower set of changes # Specifically runtime directories which are higher risk of diff --git a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs index d65361c442644a..343e78be28f465 100644 --- a/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs +++ b/src/libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs @@ -18,7 +18,6 @@ namespace System.Text.RegularExpressions /// Represents an immutable regular expression. Also contains static methods that /// allow use of regular expressions without instantiating a Regex explicitly. /// - /// public partial class Regex : ISerializable { [StringSyntax(StringSyntaxAttribute.Regex)]