From 87bbc2d4135b0ee8c5fd5f33db7411029b5484e5 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Mon, 12 Sep 2022 12:28:14 +0200
Subject: [PATCH] Rustup to rustc 1.65.0-nightly (59e7a308e 2022-09-11)

---
 build_sysroot/Cargo.lock | 4 ++--
 rust-toolchain           | 2 +-
 src/intrinsics/mod.rs    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build_sysroot/Cargo.lock b/build_sysroot/Cargo.lock
index 6c5043bb6f8e..17338aeaadaa 100644
--- a/build_sysroot/Cargo.lock
+++ b/build_sysroot/Cargo.lock
@@ -123,9 +123,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897cd85af6387be149f55acf168e41be176a02de7872403aaab184afc2f327e6"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
 dependencies = [
  "compiler_builtins",
  "libc",
diff --git a/rust-toolchain b/rust-toolchain
index f17897e48adf..4a228e3f8a87 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-09-04"
+channel = "nightly-2022-09-12"
 components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
diff --git a/src/intrinsics/mod.rs b/src/intrinsics/mod.rs
index 971cd9f63a4a..0302b843aa22 100644
--- a/src/intrinsics/mod.rs
+++ b/src/intrinsics/mod.rs
@@ -813,8 +813,8 @@ fn swap(bcx: &mut FunctionBuilder<'_>, v: Value) -> Value {
         sym::ptr_guaranteed_cmp => {
             intrinsic_args!(fx, args => (a, b); intrinsic);
 
-            let val = crate::num::codegen_ptr_binop(fx, BinOp::Eq, a, b);
-            ret.write_cvalue(fx, val);
+            let val = crate::num::codegen_ptr_binop(fx, BinOp::Eq, a, b).load_scalar(fx);
+            ret.write_cvalue(fx, CValue::by_val(val, fx.layout_of(fx.tcx.types.u8)));
         }
 
         sym::caller_location => {