Merge branch 'sync_from_rust'

Author: bjorn3

build_system/abi_cafe.rs

@@ -1,7 +1,7 @@
 usecrate::path::{Dirs,RelPath};
 usecrate::prepare::GitRepo;
-usecrate::utils::{spawn_and_wait,CargoProject,Compiler};
-usecrate::{build_sysroot,CodegenBackend,SysrootKind};
+usecrate::utils::{CargoProject,Compiler, spawn_and_wait};
+usecrate::{CodegenBackend,SysrootKind, build_sysroot};
 
 staticABI_CAFE_REPO:GitRepo = GitRepo::github(
 "Gankra",

build_system/bench.rs

@@ -6,7 +6,7 @@ use std::process::Command;
 usecrate::path::{Dirs,RelPath};
 usecrate::prepare::GitRepo;
 usecrate::rustc_info::get_file_name;
-usecrate::utils::{spawn_and_wait,Compiler};
+usecrate::utils::{Compiler, spawn_and_wait};
 
 staticSIMPLE_RAYTRACER_REPO:GitRepo = GitRepo::github(
 "ebobby",

build_system/build_sysroot.rs

@@ -6,9 +6,9 @@ use crate::path::{Dirs, RelPath};
 usecrate::prepare::apply_patches;
 usecrate::rustc_info::{get_default_sysroot, get_file_name};
 usecrate::utils::{
-ensure_empty_dir, spawn_and_wait, try_hard_link,CargoProject,Compiler,LogGroup,
+CargoProject,Compiler,LogGroup, ensure_empty_dir, spawn_and_wait, try_hard_link,
 };
-usecrate::{config,CodegenBackend,SysrootKind};
+usecrate::{CodegenBackend,SysrootKind, config};
 
 pub(crate)fnbuild_sysroot(
 dirs:&Dirs,

build_system/tests.rs

@@ -4,11 +4,11 @@ use std::path::PathBuf;
 use std::process::Command;
 
 usecrate::path::{Dirs,RelPath};
-usecrate::prepare::{apply_patches,GitRepo};
+usecrate::prepare::{GitRepo, apply_patches};
 usecrate::rustc_info::get_default_sysroot;
 usecrate::shared_utils::rustflags_from_env;
-usecrate::utils::{spawn_and_wait,CargoProject,Compiler,LogGroup};
-usecrate::{build_sysroot, config,CodegenBackend,SysrootKind};
+usecrate::utils::{CargoProject,Compiler,LogGroup, spawn_and_wait};
+usecrate::{CodegenBackend,SysrootKind, build_sysroot, config};
 
 staticBUILD_EXAMPLE_OUT_DIR:RelPath = RelPath::BUILD.join("example");
 

example/std_example.rs

@@ -238,10 +238,9 @@ unsafe fn test_simd() {
 let(zero0, zero1) = std::mem::transmute::<_,(u64,u64)>(x);
 assert_eq!((zero0, zero1),(0,0));
 assert_eq!(std::mem::transmute::<_,[u16;8]>(or),[7,7,7,7,7,7,7,7]);
-assert_eq!(
- std::mem::transmute::<_,[u16;8]>(cmp_eq),
-[0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff]
-);
+assert_eq!(std::mem::transmute::<_,[u16;8]>(cmp_eq),[
+0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff
+]);
 assert_eq!(std::mem::transmute::<_,[u16;8]>(cmp_lt),[0,0,0,0,0,0,0,0]);
 
 test_mm_slli_si128();

src/abi/mod.rs

@@ -13,9 +13,9 @@ use cranelift_module::ModuleError;
 use rustc_codegen_ssa::base::is_call_from_compiler_builtins_to_upstream_monomorphization;
 use rustc_codegen_ssa::errors::CompilerBuiltinsCannotCall;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_middle::ty::TypeVisitableExt;
 use rustc_middle::ty::layout::FnAbiOf;
 use rustc_middle::ty::print::with_no_trimmed_paths;
-use rustc_middle::ty::TypeVisitableExt;
 use rustc_session::Session;
 use rustc_span::source_map::Spanned;
 use rustc_target::abi::call::{Conv,FnAbi,PassMode};
@@ -61,6 +61,9 @@ pub(crate) fn conv_to_call_conv(sess: &Session, c: Conv, default_call_conv: Call
 Conv::CCmseNonSecureCall => {
  sess.dcx().fatal("C-cmse-nonsecure-call call conv is not yet implemented");
 }
+Conv::CCmseNonSecureEntry => {
+ sess.dcx().fatal("C-cmse-nonsecure-entry call conv is not yet implemented");
+}
 
 Conv::Msp430Intr | Conv::PtxKernel | Conv::AvrInterrupt | Conv::AvrNonBlockingInterrupt => {
 unreachable!("tried to use {c:?} call conv which only exists on an unsupported target");

src/abi/pass_mode.rs

@@ -4,7 +4,7 @@ use cranelift_codegen::ir::{ArgumentExtension, ArgumentPurpose};
 use rustc_target::abi::call::{
 ArgAbi,ArgAttributes,ArgExtensionasRustcArgExtension,CastTarget,PassMode,Reg,RegKind,
 };
-use smallvec::{smallvec,SmallVec};
+use smallvec::{SmallVec, smallvec};
 
 usecrate::prelude::*;
 usecrate::value_and_place::assert_assignable;

src/abi/returning.rs

@@ -1,7 +1,7 @@
 //! Return value handling
 
 use rustc_target::abi::call::{ArgAbi,PassMode};
-use smallvec::{smallvec,SmallVec};
+use smallvec::{SmallVec, smallvec};
 
 usecrate::prelude::*;
 

src/allocator.rs

@@ -2,8 +2,8 @@
 // Adapted from rustc
 
 use rustc_ast::expand::allocator::{
-alloc_error_handler_name, default_fn_name, global_fn_name,AllocatorKind,AllocatorTy,
-ALLOCATOR_METHODS,NO_ALLOC_SHIM_IS_UNSTABLE,
+ALLOCATOR_METHODS,AllocatorKind,AllocatorTy,NO_ALLOC_SHIM_IS_UNSTABLE,
+alloc_error_handler_name, default_fn_name, global_fn_name,
 };
 use rustc_codegen_ssa::base::allocator_kind_for_codegen;
 use rustc_session::config::OomStrategy;

src/base.rs

@@ -1,17 +1,17 @@
 //! Codegen of a single function
 
-use cranelift_codegen::ir::UserFuncName;
 use cranelift_codegen::CodegenError;
+use cranelift_codegen::ir::UserFuncName;
 use cranelift_frontend::{FunctionBuilder,FunctionBuilderContext};
 use cranelift_module::ModuleError;
 use rustc_ast::InlineAsmOptions;
 use rustc_codegen_ssa::base::is_call_from_compiler_builtins_to_upstream_monomorphization;
 use rustc_index::IndexVec;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_middle::ty::TypeVisitableExt;
 use rustc_middle::ty::adjustment::PointerCoercion;
 use rustc_middle::ty::layout::FnAbiOf;
 use rustc_middle::ty::print::with_no_trimmed_paths;
-use rustc_middle::ty::TypeVisitableExt;
 
 usecrate::constant::ConstantCx;
 usecrate::debuginfo::{FunctionDebugContext,TypeDebugContext};