rustup: update to nightly-2024-05-01.

Author: eddyb

crates/rustc_codegen_spirv/build.rs

@@ -15,9 +15,9 @@ use std::{env, fs, mem};
 /// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
 //const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
 const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
-channel = "nightly-2024-04-24"
+channel = "nightly-2024-05-01"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 244da22fabd9fa677bbd0ac601a88e5ca6917526"#;
+# commit_hash = f705de59625bb76067a5d102edc1575ff23b8845"#;
 
 fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
     let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());
@@ -187,6 +187,13 @@ mod win {",
     fn typed_alloca(&mut self, ty: Self::Type, align: Align) -> Self::Value;
     fn alloca(",
                 );
+            } else if relative_path == Path::new("src/mir/place.rs") {
+                src = src.replace(
+                    "alloca(layout.size,",
+                    "typed_alloca(bx.cx().backend_type(layout),",
+                );
+            } else if relative_path == Path::new("src/mir/operand.rs") {
+                src = src.replace("alloca(field.size,", "typed_alloca(llfield_ty,");
             }
 
             fs::write(out_path, src)?;

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

@@ -339,7 +339,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let exit_bb = self.append_sibling_block("memset_exit");
 
         let count = self.udiv(size_bytes, size_elem_const);
-        let index = self.alloca(count.ty, zero_align);
+        let index = self.alloca(self.lookup_type(count.ty).sizeof(self).unwrap(), zero_align);
         self.store(zero, index, zero_align);
         self.br(header_bb);
 
@@ -919,6 +919,45 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             s1
         }
     }
+
+    // HACK(eddyb) helper shared by `typed_alloca` and `alloca`.
+    fn declare_func_local_var(
+        &mut self,
+        ty: <Self as BackendTypes>::Type,
+        _align: Align,
+    ) -> SpirvValue {
+        let ptr_ty = self.type_ptr_to(ty);
+
+        // "All OpVariable instructions in a function must be the first instructions in the first block."
+        let mut builder = self.emit();
+        builder.select_block(Some(0)).unwrap();
+        let index = {
+            let block = &builder.module_ref().functions[builder.selected_function().unwrap()]
+                .blocks[builder.selected_block().unwrap()];
+            block
+                .instructions
+                .iter()
+                .enumerate()
+                .find_map(|(index, inst)| {
+                    if inst.class.opcode != Op::Variable {
+                        Some(InsertPoint::FromBegin(index))
+                    } else {
+                        None
+                    }
+                })
+                .unwrap_or(InsertPoint::End)
+        };
+        // TODO: rspirv doesn't have insert_variable function
+        let result_id = builder.id();
+        let inst = Instruction::new(
+            Op::Variable,
+            Some(ptr_ty),
+            Some(result_id),
+            vec![Operand::StorageClass(StorageClass::Function)],
+        );
+        builder.insert_into_block(index, inst).unwrap();
+        result_id.with_type(ptr_ty)
+    }
 }
 
 impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
@@ -1418,43 +1457,14 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
     // HACK(eddyb) new method patched into `pqp_cg_ssa` (see `build.rs`).
     #[cfg(not(rustc_codegen_spirv_disable_pqp_cg_ssa))]
     fn typed_alloca(&mut self, ty: Self::Type, align: Align) -> Self::Value {
-        self.alloca(ty, align)
+        self.declare_func_local_var(ty, align)
     }
-    fn alloca(&mut self, ty: Self::Type, _align: Align) -> Self::Value {
-        let ptr_ty = self.type_ptr_to(ty);
-        // "All OpVariable instructions in a function must be the first instructions in the first block."
-        let mut builder = self.emit();
-        builder.select_block(Some(0)).unwrap();
-        let index = {
-            let block = &builder.module_ref().functions[builder.selected_function().unwrap()]
-                .blocks[builder.selected_block().unwrap()];
-            block
-                .instructions
-                .iter()
-                .enumerate()
-                .find_map(|(index, inst)| {
-                    if inst.class.opcode != Op::Variable {
-                        Some(InsertPoint::FromBegin(index))
-                    } else {
-                        None
-                    }
-                })
-                .unwrap_or(InsertPoint::End)
-        };
-        // TODO: rspirv doesn't have insert_variable function
-        let result_id = builder.id();
-        let inst = Instruction::new(
-            Op::Variable,
-            Some(ptr_ty),
-            Some(result_id),
-            vec![Operand::StorageClass(StorageClass::Function)],
-        );
-        builder.insert_into_block(index, inst).unwrap();
-        result_id.with_type(ptr_ty)
+    fn alloca(&mut self, size: Size, align: Align) -> Self::Value {
+        self.declare_func_local_var(self.type_array(self.type_i8(), size.bytes()), align)
     }
 
-    fn byte_array_alloca(&mut self, _len: Self::Value, _align: Align) -> Self::Value {
-        self.fatal("array alloca not supported yet")
+    fn dynamic_alloca(&mut self, _len: Self::Value, _align: Align) -> Self::Value {
+        self.fatal("dynamic alloca not supported yet")
     }
 
     fn load(&mut self, ty: Self::Type, ptr: Self::Value, _align: Align) -> Self::Value {

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2024-04-24"
+channel = "nightly-2024-05-01"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 244da22fabd9fa677bbd0ac601a88e5ca6917526
+# commit_hash = f705de59625bb76067a5d102edc1575ff23b8845
 
 # Whenever changing the nightly channel, update the commit hash above, and make
 # sure to change `REQUIRED_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` also.

tests/ui/dis/ptr_copy.normal.stderr

@@ -1,13 +1,13 @@
 error: cannot memcpy dynamically sized data
-    --> $CORE_SRC/intrinsics.rs:3076:9
+    --> $CORE_SRC/intrinsics.rs:3111:9
      |
-3076 |         copy(src, dst, count)
+3111 |         copy(src, dst, count)
      |         ^^^^^^^^^^^^^^^^^^^^^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics.rs:3055:21
+    --> $CORE_SRC/intrinsics.rs:3090:21
      |
-3055 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
+3090 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
      |                     ^^^^
 note: called by `ptr_copy::copy_via_raw_ptr`
     --> $DIR/ptr_copy.rs:28:18
@@ -28,27 +28,27 @@ note: called by `main`
 error: cannot cast between pointer types
        from `*f32`
          to `*struct () {  }`
-    --> $CORE_SRC/intrinsics.rs:3064:9
+    --> $CORE_SRC/intrinsics.rs:3099:9
      |
-3064 | /         ub_checks::assert_unsafe_precondition!(
-3065 | |             check_language_ub,
-3066 | |             "ptr::copy_nonoverlapping requires that both pointer arguments are aligned and non-null /
-3067 | |             and the specified memory ranges do not overlap",
+3099 | /         ub_checks::assert_unsafe_precondition!(
+3100 | |             check_language_ub,
+3101 | |             "ptr::copy_nonoverlapping requires that both pointer arguments are aligned and non-null /
+3102 | |             and the specified memory ranges do not overlap",
 ...    |
-3074 | |                 && ub_checks::is_aligned_and_not_null(dst, align)
-3075 | |         );
+3109 | |                 && ub_checks::is_aligned_and_not_null(dst, align)
+3110 | |         );
      | |_________^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics.rs:3064:9
+    --> $CORE_SRC/intrinsics.rs:3099:9
      |
-3064 | /         ub_checks::assert_unsafe_precondition!(
-3065 | |             check_language_ub,
-3066 | |             "ptr::copy_nonoverlapping requires that both pointer arguments are aligned and non-null /
-3067 | |             and the specified memory ranges do not overlap",
+3099 | /         ub_checks::assert_unsafe_precondition!(
+3100 | |             check_language_ub,
+3101 | |             "ptr::copy_nonoverlapping requires that both pointer arguments are aligned and non-null /
+3102 | |             and the specified memory ranges do not overlap",
 ...    |
-3074 | |                 && ub_checks::is_aligned_and_not_null(dst, align)
-3075 | |         );
+3109 | |                 && ub_checks::is_aligned_and_not_null(dst, align)
+3110 | |         );
      | |_________^
 note: called by `ptr_copy::copy_via_raw_ptr`
     --> $DIR/ptr_copy.rs:28:18