Skip to content

Commit 48aec1c

Browse files
tesujitesuji
committed
add stack threshold indicates that llvm inlines the array
1 parent 6745434 commit 48aec1c

File tree

4 files changed

+75
-90
lines changed

4 files changed

+75
-90
lines changed

‎clippy_lints/src/let_arr_const.rs

Lines changed: 43 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_sugg};
1+
use clippy_utils::diagnostics::span_lint_and_help;
22
use clippy_utils::source::snippet_with_applicability;
33
use clippy_utils::ty::implements_trait;
4+
use clippy_utils::visitors::is_const_evaluatable;
45
use hir::{BindingMode, ExprKind, PatKind, Stmt, StmtKind};
56
use rustc_errors::Applicability;
67
use rustc_hir as hir;
@@ -38,58 +39,73 @@ declare_clippy_lint! {
3839

3940
declare_lint_pass!(LetArrConst => [LET_ARR_CONST]);
4041

41-
impl LateLintPass<'_> for LetArrConst {
42-
// should lint on `let array` which non-mut and:
43-
// if let repeat:
44-
// if let expr: copy
45-
// todo: repair clippy::author
46-
fn check_stmt(&mut self, cx: &LateContext<'_>, stmt: &Stmt<'_>) {
47-
if let StmtKind::Let(ref local) = stmt.kind
42+
// FIXME: See also LARGE_CONST_ARRAYS, LARGE_STACK_ARRAYS.
43+
impl<'tcx> LateLintPass<'tcx> for LetArrConst {
44+
fn check_stmt(&mut self, cx: &LateContext<'tcx>, stmt: &'tcx Stmt<'_>) {
45+
// let pat: ty = init;
46+
if let StmtKind::Let(local) = stmt.kind
4847
&& let PatKind::Binding(BindingMode::NONE, _, _name, None) = local.pat.kind
49-
&& let Some(ref init) = local.init
48+
&& let Some(init) = local.init
5049
&& !init.span.from_expansion()
5150
{
51+
const STACK_THRESHOLD: u64 = 16;
52+
// lint only `if size_of(init) > STACK_THRESHOLD`
53+
let ty = cx.typeck_results().expr_ty(init);
54+
if let Ok(layout) = cx.tcx.layout_of(cx.param_env.and(ty))
55+
&& let size = layout.layout.size()
56+
&& size.bytes() <= STACK_THRESHOLD
57+
{
58+
return;
59+
}
60+
5261
let mut applicability = Applicability::MachineApplicable;
5362
let lang_items = cx.tcx.lang_items();
5463
let Some(copy_id) = lang_items.copy_trait() else {
5564
return;
5665
};
57-
// `let arr = [<Copy type>; 42];
66+
67+
let generic_msg = "using `static` to push the array to read-only section of program";
68+
let report_static = || {
69+
span_lint_and_help(
70+
cx,
71+
LET_ARR_CONST,
72+
local.span,
73+
"declaring a read-only array on the stack",
74+
None,
75+
generic_msg,
76+
);
77+
};
78+
79+
// `if init is [<Copy type>; 42]
5880
let mut should = false;
59-
if let ExprKind::Repeat(ref value, _length) = init.kind {
81+
if let ExprKind::Repeat(value, _length) = init.kind {
6082
let ty = cx.typeck_results().expr_ty(value);
6183
if !implements_trait(cx, ty, copy_id, &[]) {
62-
span_lint_and_help(
63-
cx,
64-
LET_ARR_CONST,
65-
local.span,
66-
"declaring a read-only array on the stack",
67-
None,
68-
"using `static` to push the array to read-only section of program",
69-
);
84+
report_static();
7085
return;
7186
}
7287
should = true;
7388
}
74-
// `let arr = [1, 2, 3, 4];
75-
if let ExprKind::Array([ref expr, ..]) = init.kind
89+
// `if init is [1, 2, 3, 4]
90+
if let ExprKind::Array(items @ [ref expr, ..]) = init.kind
7691
&& let ty = cx.typeck_results().expr_ty(expr)
7792
&& implements_trait(cx, ty, copy_id, &[])
7893
{
79-
should = true;
94+
if items.iter().all(|expr| is_const_evaluatable(cx, expr)) {
95+
should = true;
96+
}
8097
}
8198

8299
if should {
83100
let snippet = snippet_with_applicability(cx, init.span, "_", &mut applicability);
84-
let sugg = format!("*&{snippet}");
85-
span_lint_and_sugg(
101+
let msg = format!("{generic_msg} or try: `*&{snippet}`");
102+
span_lint_and_help(
86103
cx,
87104
LET_ARR_CONST,
88105
init.span,
89106
"declaring a read-only array on the stack",
90-
"using `static` to push the array to read-only section of program or try",
91-
sugg,
92-
applicability,
107+
None,
108+
msg,
93109
);
94110
}
95111
}

‎tests/ui/let_arr_const.fixed

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎tests/ui/let_arr_const.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ pub mod issue_rust_73825 {
1212
pub fn do_not() {
1313
let _repeat = *&[0; 64];
1414
let _arr = *&[0, 1, 2, 3, 4];
15+
16+
let (x, y) = (1, 2);
17+
let _arr = [x, y];
18+
let _arr = [42u8; 16];
1519
let _arr = mac_gen_arr!();
1620
let _arr = gen_array();
1721
let _arr = gen_array_non_copy();
22+
let _arr = [gen_array_no_const(), gen_array_no_const()];
1823
{
1924
let mut arr = [0; 32];
2025
arr[1] = 42;
@@ -30,6 +35,10 @@ pub mod issue_rust_73825 {
3035
}
3136
}
3237

38+
fn gen_array_no_const() -> [u32; 42] {
39+
unimplemented!()
40+
}
41+
3342
const fn gen_array() -> [u32; 42] {
3443
unimplemented!()
3544
}
@@ -41,7 +50,9 @@ pub mod issue_rust_73825 {
4150
pub fn do_it() {
4251
// Copy type
4352
let _repeat: [i32; 64] = [0; 64];
53+
let _repeat = [42u8; 17];
4454
let _arr = [0, 1, 3, 5, 7, 8];
55+
let _arr = [gen_array(), gen_array()];
4556
// Non Copy type
4657
{
4758
let _repeat_const = [const { String::new() }; 32];

‎tests/ui/let_arr_const.stderr

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,52 @@
11
error: declaring a read-only array on the stack
2-
--> tests/ui/let_arr_const.rs:43:34
2+
--> tests/ui/let_arr_const.rs:52:34
33
|
44
LL | let _repeat: [i32; 64] = [0; 64];
55
| ^^^^^^^
66
|
7+
= help: using `static` to push the array to read-only section of program or try: `*&[0; 64]`
78
= note: `-D clippy::let-arr-const` implied by `-D warnings`
89
= help: to override `-D warnings` add `#[allow(clippy::let_arr_const)]`
9-
help: using `static` to push the array to read-only section of program or try
10+
11+
error: declaring a read-only array on the stack
12+
--> tests/ui/let_arr_const.rs:53:23
13+
|
14+
LL | let _repeat = [42u8; 17];
15+
| ^^^^^^^^^^
1016
|
11-
LL | let _repeat: [i32; 64] = *&[0; 64];
12-
| ~~~~~~~~~
17+
= help: using `static` to push the array to read-only section of program or try: `*&[42u8; 17]`
1318

1419
error: declaring a read-only array on the stack
15-
--> tests/ui/let_arr_const.rs:44:20
20+
--> tests/ui/let_arr_const.rs:54:20
1621
|
1722
LL | let _arr = [0, 1, 3, 5, 7, 8];
1823
| ^^^^^^^^^^^^^^^^^^
1924
|
20-
help: using `static` to push the array to read-only section of program or try
25+
= help: using `static` to push the array to read-only section of program or try: `*&[0, 1, 3, 5, 7, 8]`
26+
27+
error: declaring a read-only array on the stack
28+
--> tests/ui/let_arr_const.rs:55:20
29+
|
30+
LL | let _arr = [gen_array(), gen_array()];
31+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
2132
|
22-
LL | let _arr = *&[0, 1, 3, 5, 7, 8];
23-
| ~~~~~~~~~~~~~~~~~~~~
33+
= help: using `static` to push the array to read-only section of program or try: `*&[gen_array(), gen_array()]`
2434

2535
error: declaring a read-only array on the stack
26-
--> tests/ui/let_arr_const.rs:47:13
36+
--> tests/ui/let_arr_const.rs:58:13
2737
|
2838
LL | let _repeat_const = [const { String::new() }; 32];
2939
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3040
|
3141
= help: using `static` to push the array to read-only section of program
3242

3343
error: declaring a read-only array on the stack
34-
--> tests/ui/let_arr_const.rs:49:13
44+
--> tests/ui/let_arr_const.rs:60:13
3545
|
3646
LL | let _repeat = [EMPTY; 32];
3747
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
3848
|
3949
= help: using `static` to push the array to read-only section of program
4050

41-
error: aborting due to 4 previous errors
51+
error: aborting due to 6 previous errors
4252

0 commit comments

Comments
 (0)