From 3d639f216f279e03098a1a5ba93fe764c370c281 Mon Sep 17 00:00:00 2001 From: Peter Sollich Date: Fri, 21 Aug 2020 14:57:06 +0200 Subject: [PATCH 1/5] delete backport.yml so I can push to master --- .github/workflows/backport.yml | 26 ------------------------ .gitignore | 37 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/backport.yml diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml deleted file mode 100644 index 79cde1d3ce293..0000000000000 --- a/.github/workflows/backport.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Backport PR to branch -on: - issue_comment: - types: [created] - -jobs: - backport: - if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to') - runs-on: ubuntu-20.04 - steps: - - name: Checkout repo - uses: actions/checkout@v2 - - name: Run backport - uses: ./eng/actions/backport - with: - auth_token: ${{ secrets.GITHUB_TOKEN }} - pr_description_template: | - Backport of #%source_pr_number% to %target_branch% - - /cc %cc_users% - - ## Customer Impact - - ## Testing - - ## Risk diff --git a/.gitignore b/.gitignore index 7596f954d9512..0a77336126eb4 100644 --- a/.gitignore +++ b/.gitignore @@ -356,3 +356,40 @@ src/coreclr/src/System.Private.CoreLib/common # Mono Wasm-specific excludes src/mono/wasm/emsdk/ src/mono/wasm/.stamp-wasm-install-and-select* +/src/tests/readytorun/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt +/src/tests/readytorun/out/build/x64-Debug (Standard)/rules.ninja +/src/tests/readytorun/out/build/x64-Debug (Standard)/build.ninja +/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/target-nativelibrary-Debug-db3cc60a4a30aa6ad4f9.json +/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/index-2020-08-21T10-11-45-0169.json +/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/codemodel-v2-54a6f181cd4cae4a23f1.json +/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/cmakeFiles-v1-721ff5cc9aabe9506246.json +/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/cache-v2-94dde366ed96f1844532.json +/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply +/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json +/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS +/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1 +/src/tests/readytorun/out/build/x64-Debug (Standard) +/src/tests/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt +/src/tests/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json +/src/tests/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS +/src/tests/out/build/x64-Debug (Standard) +/src/tests +/src/mono/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt +/src/mono/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json +/src/mono/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS +/src/mono/out/build/x64-Debug (Standard) +/src/libraries/Native/Windows/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt +/src/libraries/Native/Windows/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json +/src/libraries/Native/Windows/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS +/src/libraries/Native/Windows/out/build/x64-Debug (Standard) +/src/libraries/Native/Unix/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt +/src/libraries/Native/Unix/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json +/src/libraries/Native/Unix/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS +/src/libraries/Native/Unix/out/build/x64-Debug (Standard) +/src/libraries/Native +/src/installer/corehost/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt +/src/installer/corehost/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json +/src/installer/corehost/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS +/src/installer/corehost/out/build/x64-Debug (Standard) +/src/coreclr/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt +/src/coreclr/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json From 0fc9aebbf6d85d57e79c7ef5814e4fd1fec35813 Mon Sep 17 00:00:00 2001 From: Peter Sollich Date: Thu, 27 Aug 2020 11:36:14 +0200 Subject: [PATCH 2/5] Undo unintended changes --- .github/workflows/backport.yml | 26 ++++++++++++++++++++++++ .gitignore | 37 ---------------------------------- 2 files changed, 26 insertions(+), 37 deletions(-) create mode 100644 .github/workflows/backport.yml diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml new file mode 100644 index 0000000000000..79cde1d3ce293 --- /dev/null +++ b/.github/workflows/backport.yml @@ -0,0 +1,26 @@ +name: Backport PR to branch +on: + issue_comment: + types: [created] + +jobs: + backport: + if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to') + runs-on: ubuntu-20.04 + steps: + - name: Checkout repo + uses: actions/checkout@v2 + - name: Run backport + uses: ./eng/actions/backport + with: + auth_token: ${{ secrets.GITHUB_TOKEN }} + pr_description_template: | + Backport of #%source_pr_number% to %target_branch% + + /cc %cc_users% + + ## Customer Impact + + ## Testing + + ## Risk diff --git a/.gitignore b/.gitignore index 0a77336126eb4..7596f954d9512 100644 --- a/.gitignore +++ b/.gitignore @@ -356,40 +356,3 @@ src/coreclr/src/System.Private.CoreLib/common # Mono Wasm-specific excludes src/mono/wasm/emsdk/ src/mono/wasm/.stamp-wasm-install-and-select* -/src/tests/readytorun/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt -/src/tests/readytorun/out/build/x64-Debug (Standard)/rules.ninja -/src/tests/readytorun/out/build/x64-Debug (Standard)/build.ninja -/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/target-nativelibrary-Debug-db3cc60a4a30aa6ad4f9.json -/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/index-2020-08-21T10-11-45-0169.json -/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/codemodel-v2-54a6f181cd4cae4a23f1.json -/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/cmakeFiles-v1-721ff5cc9aabe9506246.json -/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply/cache-v2-94dde366ed96f1844532.json -/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/reply -/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json -/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS -/src/tests/readytorun/out/build/x64-Debug (Standard)/.cmake/api/v1 -/src/tests/readytorun/out/build/x64-Debug (Standard) -/src/tests/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt -/src/tests/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json -/src/tests/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS -/src/tests/out/build/x64-Debug (Standard) -/src/tests -/src/mono/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt -/src/mono/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json -/src/mono/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS -/src/mono/out/build/x64-Debug (Standard) -/src/libraries/Native/Windows/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt -/src/libraries/Native/Windows/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json -/src/libraries/Native/Windows/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS -/src/libraries/Native/Windows/out/build/x64-Debug (Standard) -/src/libraries/Native/Unix/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt -/src/libraries/Native/Unix/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json -/src/libraries/Native/Unix/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS -/src/libraries/Native/Unix/out/build/x64-Debug (Standard) -/src/libraries/Native -/src/installer/corehost/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt -/src/installer/corehost/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json -/src/installer/corehost/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS -/src/installer/corehost/out/build/x64-Debug (Standard) -/src/coreclr/out/build/x64-Debug (Standard)/VSInheritEnvironments.txt -/src/coreclr/out/build/x64-Debug (Standard)/.cmake/api/v1/query/client-MicrosoftVS/query.json From 10ae700ac2e21dcde40da5af1230a36fcee84a90 Mon Sep 17 00:00:00 2001 From: Peter Sollich Date: Tue, 17 Nov 2020 13:34:40 +0100 Subject: [PATCH 3/5] Update breaking change number because doubly linked free lists use one additional bit in the method table pointer at the beginning of objects now. --- src/coreclr/src/inc/sospriv.idl | 2 +- src/coreclr/src/pal/prebuilt/inc/sospriv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/inc/sospriv.idl b/src/coreclr/src/inc/sospriv.idl index dae0a4ff52088..6da8b5814f7ee 100644 --- a/src/coreclr/src/inc/sospriv.idl +++ b/src/coreclr/src/inc/sospriv.idl @@ -413,7 +413,7 @@ interface ISOSDacInterface8 : IUnknown // Increment anytime there is a change in the data structures that SOS depends on like // stress log structs (StressMsg, StressLogChunck, ThreadStressLog, etc), exception // stack traces (StackTraceElement), the PredefinedTlsSlots enums, etc. -cpp_quote("#define SOS_BREAKING_CHANGE_VERSION 1") +cpp_quote("#define SOS_BREAKING_CHANGE_VERSION 2") [ object, diff --git a/src/coreclr/src/pal/prebuilt/inc/sospriv.h b/src/coreclr/src/pal/prebuilt/inc/sospriv.h index e1cbc05e9028a..38bb6791ea177 100644 --- a/src/coreclr/src/pal/prebuilt/inc/sospriv.h +++ b/src/coreclr/src/pal/prebuilt/inc/sospriv.h @@ -2675,7 +2675,7 @@ EXTERN_C const IID IID_ISOSDacInterface8; /* interface __MIDL_itf_sospriv_0000_0012 */ /* [local] */ -#define SOS_BREAKING_CHANGE_VERSION 1 +#define SOS_BREAKING_CHANGE_VERSION 2 extern RPC_IF_HANDLE __MIDL_itf_sospriv_0000_0012_v0_0_c_ifspec; From 45935217336c8f030ce4e1b834fce33ac4f1f963 Mon Sep 17 00:00:00 2001 From: Peter Sollich Date: Thu, 19 Nov 2020 09:24:38 +0100 Subject: [PATCH 4/5] Add comment above the code setting major_version_number noting that SOS_BREAKING_CHANGE_VERSION should be changed instead. --- src/coreclr/src/gc/gc.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/coreclr/src/gc/gc.cpp b/src/coreclr/src/gc/gc.cpp index 6eb6142f27b7b..e30eeff717b31 100644 --- a/src/coreclr/src/gc/gc.cpp +++ b/src/coreclr/src/gc/gc.cpp @@ -40519,6 +40519,9 @@ void PopulateDacVars(GcDacVars *gcDacVars) #ifndef DACCESS_COMPILE assert(gcDacVars != nullptr); *gcDacVars = {}; + // Note: these version numbers are not actually checked by SOS, so if you change + // the runtime in a way that makes it incompatible with SOS, please change + // SOS_BREAKING_CHANGE_VERSION in both the runtime and the diagnostics repo gcDacVars->major_version_number = 1; gcDacVars->minor_version_number = 0; gcDacVars->built_with_svr = &g_built_with_svr_gc; From e88123d8953885b5cb731f7c336a0ec71ebb727a Mon Sep 17 00:00:00 2001 From: Peter Sollich Date: Thu, 19 Nov 2020 09:36:26 +0100 Subject: [PATCH 5/5] Adjusted the wording to what Maoni originally suggested as it makes more sense given that PopulateDacVars is actually in gc.cpp. --- src/coreclr/src/gc/gc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/src/gc/gc.cpp b/src/coreclr/src/gc/gc.cpp index e30eeff717b31..0efd127445073 100644 --- a/src/coreclr/src/gc/gc.cpp +++ b/src/coreclr/src/gc/gc.cpp @@ -40520,7 +40520,7 @@ void PopulateDacVars(GcDacVars *gcDacVars) assert(gcDacVars != nullptr); *gcDacVars = {}; // Note: these version numbers are not actually checked by SOS, so if you change - // the runtime in a way that makes it incompatible with SOS, please change + // the GC in a way that makes it incompatible with SOS, please change // SOS_BREAKING_CHANGE_VERSION in both the runtime and the diagnostics repo gcDacVars->major_version_number = 1; gcDacVars->minor_version_number = 0;