Updated to nightly-2022-11-14

This commit is contained in:
Sylvester Hesp 2023-01-04 16:14:25 +01:00 committed by Eduard-Mihai Burtescu
parent 4a217f21d6
commit 816c3409e2
6 changed files with 16 additions and 7 deletions

View File

@ -10,9 +10,9 @@ use std::process::{Command, ExitCode};
/// `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");
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
channel = "nightly-2022-10-29"
channel = "nightly-2022-11-14"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = 9565dfeb4e6225177bbe78f18cd48a7982f34401"#;
# commit_hash = e631891f7ad40eac3ef58ec3c2b57ecd81e40615"#;
fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc"));

View File

@ -177,6 +177,14 @@ impl<'tcx> BaseTypeMethods<'tcx> for CodegenCx<'tcx> {
SpirvType::Float(64).def(DUMMY_SP, self)
}
fn type_array(&self, ty: Self::Type, len: u64) -> Self::Type {
SpirvType::Array {
element: ty,
count: self.constant_u64(DUMMY_SP, len),
}
.def(DUMMY_SP, self)
}
fn type_func(&self, args: &[Self::Type], ret: Self::Type) -> Self::Type {
SpirvType::Function {
return_type: ret,

View File

@ -389,7 +389,7 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
_: TyCtxt<'tcx>,
_: &str,
_: AllocatorKind,
_: bool,
_: AllocatorKind,
) -> Self::Module {
todo!()
}

View File

@ -158,6 +158,7 @@ fn link_with_linker_opts(
false,
None,
false,
false,
);
rustc_errors::Handler::with_emitter_and_flags(

View File

@ -5,9 +5,9 @@
# to the user in the error, instead of "error: invalid channel name '[toolchain]'".
[toolchain]
channel = "nightly-2022-10-29"
channel = "nightly-2022-11-14"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = 9565dfeb4e6225177bbe78f18cd48a7982f34401
# commit_hash = e631891f7ad40eac3ef58ec3c2b57ecd81e40615
# Whenever changing the nightly channel, update the commit hash above, and make
# sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also.

View File

@ -1,7 +1,7 @@
error: Cannot memcpy dynamically sized data
--> $CORE_SRC/intrinsics.rs:2449:9
--> $CORE_SRC/intrinsics.rs:2518:9
|
2449 | copy(src, dst, count)
2518 | copy(src, dst, count)
| ^^^^^^^^^^^^^^^^^^^^^
|
= note: Stack: