From fda115ad0775932820af5de65704ac950d57a917 Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <eddyb@lyken.rs>
Date: Wed, 21 Apr 2021 20:12:21 +0300
Subject: [PATCH 1/2] [HACK] rustc_codegen_ssa: remove micro-opt around
 `cleanup_ret` trampoline.

---
 compiler/rustc_codegen_ssa/src/mir/block.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/compiler/rustc_codegen_ssa/src/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs
index fd3f89a2aee96..9a8c3f4eb78b8 100644
--- a/compiler/rustc_codegen_ssa/src/mir/block.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/block.rs
@@ -88,14 +88,7 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
         bx: &mut Bx,
         target: mir::BasicBlock,
     ) {
-        let (lltarget, is_cleanupret) = self.lltarget(fx, target);
-        if is_cleanupret {
-            // micro-optimization: generate a `ret` rather than a jump
-            // to a trampoline.
-            bx.cleanup_ret(self.funclet(fx).unwrap(), Some(lltarget));
-        } else {
-            bx.br(lltarget);
-        }
+        bx.br(self.llblock(fx, target));
     }
 
     /// Call `fn_ptr` of `fn_abi` with the arguments `llargs`, the optional

From 6d892ed400d1de87fb146a6b2057fd0176d5ac9e Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <eddyb@lyken.rs>
Date: Wed, 21 Apr 2021 20:18:47 +0300
Subject: [PATCH 2/2] [HACK] switch PR CI to x86_64-msvc-2.

---
 .github/workflows/ci.yml     | 8 +++++---
 src/ci/github-actions/ci.yml | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ffaa2b03df9e7..781e82bcec237 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,9 +43,11 @@ jobs:
           - name: mingw-check
             os: ubuntu-latest-xl
             env: {}
-          - name: x86_64-gnu-llvm-10
-            os: ubuntu-latest-xl
-            env: {}
+          - name: x86_64-msvc-2
+            env:
+              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
+              SCRIPT: make ci-subset-2
+            os: windows-latest-xl
           - name: x86_64-gnu-tools
             env:
               CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index a59a90b86bcaf..a8867d9b95006 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -280,8 +280,11 @@ jobs:
           - name: mingw-check
             <<: *job-linux-xl
 
-          - name: x86_64-gnu-llvm-10
-            <<: *job-linux-xl
+          - name: x86_64-msvc-2
+            env:
+              RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
+              SCRIPT: make ci-subset-2
+            <<: *job-windows-xl
 
           - name: x86_64-gnu-tools
             env: