modified: compiler/rustc_codegen_llvm/src/attributes.rs

	modified:   compiler/rustc_mir_transform/src/lib.rs
	modified:   compiler/rustc_mir_transform/src/stack_protector.rs
	modified:   compiler/rustc_target/src/spec/mod.rs
	modified:   tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-64bit.rs
	modified:   tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs

Author: cezarbbb

compiler/rustc_codegen_llvm/src/attributes.rs

@@ -274,7 +274,7 @@ fn stackprotector_attr<'ll>(cx: &CodegenCx<'ll, '_>, def_id: DefId) -> Option<&'
     let sspattr = match cx.sess().stack_protector() {
         StackProtector::None => return None,
         StackProtector::All => AttributeKind::StackProtectReq,
-        
+
         StackProtector::Rusty => {
             if cx.tcx.stack_protector.borrow().contains(&def_id) {
                 AttributeKind::StackProtectStrong

compiler/rustc_mir_transform/src/lib.rs

@@ -452,7 +452,7 @@ fn mir_promoted(
     lint_tail_expr_drop_order::run_lint(tcx, def, &body);
 
     let promoted = promote_pass.promoted_fragments.into_inner();
-    
+
     if tcx.sess.stack_protector() == StackProtector::Rusty {
         pm::run_passes(
             tcx,

compiler/rustc_mir_transform/src/stack_protector.rs

@@ -4,8 +4,7 @@ use std::ops::Deref;
 
 use rustc_middle::mir::*;
 use rustc_middle::ty;
-use rustc_middle::ty::Instance;
-use rustc_middle::ty::TyCtxt;
+use rustc_middle::ty::{Instance, TyCtxt};
 use rustc_target::callconv::PassMode;
 
 pub(super) struct StackProtectorFinder;
@@ -41,10 +40,12 @@ impl<'tcx> crate::MirPass<'tcx> for StackProtectorFinder {
             }
 
             let instance = Instance::mono(tcx, def_id);
-            let Ok(fn_abi) = tcx.fn_abi_of_instance(ty::TypingEnv::fully_monomorphized().as_query_input((instance, ty::List::empty())),)
-            else { 
+            let Ok(fn_abi) = tcx.fn_abi_of_instance(
+                ty::TypingEnv::fully_monomorphized().as_query_input((instance, ty::List::empty())),
+            ) else {
                 // FIXME: Find when an Err() message is returned
-                return; 
+
+                return;
             };
 
             // for arg in fn_abi.args.iter() {
@@ -55,11 +56,11 @@ impl<'tcx> crate::MirPass<'tcx> for StackProtectorFinder {
             // }
 
             let ret = &fn_abi.ret;
-            if matches!(&ret.mode, PassMode::Indirect { attrs: _, meta_attrs: _, on_stack: false}) {
+            if matches!(&ret.mode, PassMode::Indirect { attrs: _, meta_attrs: _, on_stack: false })
+            {
                 tcx.stack_protector.borrow_mut().insert(def_id);
                 return;
             }
-
         }
     }
 

compiler/rustc_target/src/spec/mod.rs

@@ -1765,7 +1765,7 @@ pub enum StackProtector {
     /// - calls to stack memory allocation
     /// - obtaining reference/pointer of local variables
     Rusty,
-    
+
     /// Generate stack canaries in all functions.
     All,
 }

tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-64bit.rs

@@ -209,7 +209,7 @@ pub fn local_var_addr_taken_used_locally_only(factory: fn() -> i32, sink: fn(i32
 
     // FIXME: rusty stack smash protection needs to support inline scenario detection
     // rusty: __security_check_cookie
-    
+
     // strong-NOT: __security_check_cookie
     // basic-NOT: __security_check_cookie
     // none-NOT: __security_check_cookie
@@ -247,7 +247,7 @@ pub fn local_large_var_moved(f: fn(Gigastruct)) {
     // ```
 
     // all: __security_check_cookie
-    
+
     // FIXME: How does the rust compiler handle moves of large structures?
     // rusty-NOT: __security_check_cookie
 
@@ -280,10 +280,10 @@ pub fn local_large_var_cloned(f: fn(Gigastruct)) {
     // ```
 
     // all: __security_check_cookie
-    
+
     // FIXME: How does the rust compiler handle moves of large structures?
     // rusty-NOT: __security_check_cookie
-    
+
     // strong: __security_check_cookie
     // basic: __security_check_cookie
     // none-NOT: __security_check_cookie
@@ -322,7 +322,7 @@ extern "C" {
 #[no_mangle]
 pub fn alloca_small_compile_time_constant_arg(f: fn(*mut ())) {
     f(unsafe { alloca(8) });
- 
+
     // all: __security_check_cookie
 
     // FIXME: Rusty thinks a function that returns a mutable raw pointer may

tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs

@@ -190,10 +190,10 @@ pub fn local_var_addr_taken_used_locally_only(factory: fn() -> i32, sink: fn(i32
     // the `strong` heuristic.
 
     // all: __stack_chk_fail
-    
+
     // FIXME: rusty stack smash protection needs to support inline scenario detection
     // rusty: __stack_chk_fail
-    
+
     // strong-NOT: __stack_chk_fail
     // basic-NOT: __stack_chk_fail
     // none-NOT: __stack_chk_fail
@@ -231,10 +231,10 @@ pub fn local_large_var_moved(f: fn(Gigastruct)) {
     // ```
 
     // all: __stack_chk_fail
-    
+
     // FIXME: How does the rust compiler handle moves of large structures?
     // rusty-NOT: __stack_chk_fail
-    
+
     // strong: __stack_chk_fail
     // basic: __stack_chk_fail
     // none-NOT: __stack_chk_fail
@@ -264,10 +264,10 @@ pub fn local_large_var_cloned(f: fn(Gigastruct)) {
     // ```
 
     // all: __stack_chk_fail
-    
+
     // FIXME: How does the rust compiler handle moves of large structures?
     // rusty-NOT: __stack_chk_fail
-    
+
     // strong: __stack_chk_fail
     // basic: __stack_chk_fail
     // none-NOT: __stack_chk_fail
@@ -313,7 +313,7 @@ pub fn alloca_small_compile_time_constant_arg(f: fn(*mut ())) {
     // be a stack memory allocation function, so it performs stack smash protection.
     // Is it possible to optimize the heuristics?
     // rusty: __stack_chk_fail
-    
+
     // strong-NOT: __stack_chk_fail
     // basic-NOT: __stack_chk_fail
     // none-NOT: __stack_chk_fail
@@ -367,10 +367,10 @@ pub fn unsized_fn_param(s: [u8], l: bool, f: fn([u8])) {
     // heuristics.
 
     // all: __stack_chk_fail
-    
+
     // FIXME: Does Rusty need to handle this type of optimization?
     // rusty: __stack_chk_fail
-    
+
     // strong-NOT: __stack_chk_fail
     // basic-NOT: __stack_chk_fail
     // none-NOT: __stack_chk_fail