clean version

Author: Soveu

clippy_lints/src/pointer_in_nomem_asm_block.rs

@@ -1,10 +1,9 @@
-use rustc_hir::*;
+use clippy_utils::diagnostics::span_lint;
+use rustc_ast::InlineAsmOptions;
+use rustc_hir::{Expr, ExprKind, InlineAsm, InlineAsmOperand};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::declare_lint_pass;
-use rustc_ast::InlineAsmOptions;
-use clippy_utils::diagnostics::span_lint_and_then;
-use rustc_span::{BytePos, Span};
-use rustc_errors::Applicability;
+use rustc_span::Span;
 
 fn has_in_operand_pointer(cx: &LateContext<'_>, asm_op: &InlineAsmOperand<'_>) -> bool {
     let asm_in_expr = match asm_op {
@@ -15,43 +14,37 @@ fn has_in_operand_pointer(cx: &LateContext<'_>, asm_op: &InlineAsmOperand<'_>) -
         | InlineAsmOperand::Label { .. } => return false,
         InlineAsmOperand::In { expr, .. } => expr,
         InlineAsmOperand::InOut { expr, .. } => expr,
-        InlineAsmOperand::SplitInOut { in_expr, ..} => in_expr,
+        InlineAsmOperand::SplitInOut { in_expr, .. } => in_expr,
     };
 
-    return match cx.typeck_results().expr_ty(asm_in_expr).kind() {
-        rustc_middle::ty::TyKind::RawPtr(..) => true,
-        rustc_middle::ty::TyKind::Ref(..) => true,
-        _ => false,
-    };
+    // This checks for raw ptrs, refs and function pointers - the last one
+    // also technically counts as reading memory.
+    return cx.typeck_results().expr_ty(asm_in_expr).is_any_ptr();
 }
 
-fn shift_span_by_two_bytes(s: Span) -> Span {
-    s.with_lo(s.lo() + BytePos(2))
-}
-
-fn yeet_lint(cx: &LateContext<'_>, asm: &InlineAsm<'_>, asm_span: Span, op_spans: Vec<Span>) {
-    let last_op_span = asm.operands.last().unwrap().1;
-    let probably_asm_options_span = asm_span.trim_start(last_op_span).map(shift_span_by_two_bytes);
-
-    span_lint_and_then(cx, POINTER_IN_NOMEM_ASM_BLOCK, op_spans, "passing pointer to nomem asm block", |diag| {
-        if let Some(probably_asm_options_span) = probably_asm_options_span {
-            diag.span_note(probably_asm_options_span, "flags declared here");
-        }
-    });
+fn yeet_lint(cx: &LateContext<'_>, op_spans: Vec<Span>) {
+    span_lint(
+        cx,
+        POINTER_IN_NOMEM_ASM_BLOCK,
+        op_spans,
+        "passing pointer to nomem asm block",
+    );
 }
 
-fn check_asm(cx: &LateContext<'_>, asm: &InlineAsm<'_>, asm_span: Span) {
-    if !asm.options.contains(InlineAsmOptions::NOMEM) || asm.operands.is_empty() {
+fn check_asm(cx: &LateContext<'_>, asm: &InlineAsm<'_>) {
+    if !asm.options.contains(InlineAsmOptions::NOMEM) {
         return;
     }
 
-    let spans = asm.operands.iter()
+    let spans = asm
+        .operands
+        .iter()
         .filter(|(op, _span)| has_in_operand_pointer(cx, op))
         .map(|(_op, span)| *span)
         .collect::<Vec<Span>>();
 
     if !spans.is_empty() {
-        yeet_lint(cx, asm, asm_span, spans);
+        yeet_lint(cx, spans);
     }
 }
 
@@ -86,7 +79,7 @@ declare_lint_pass!(PointerInNomemAsmBlock => [POINTER_IN_NOMEM_ASM_BLOCK]);
 impl<'tcx> LateLintPass<'tcx> for PointerInNomemAsmBlock {
     fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &Expr<'tcx>) {
         if let ExprKind::InlineAsm(asm) = &expr.kind {
-            check_asm(cx, asm, expr.span);
+            check_asm(cx, asm);
         }
     }
 }

tests/ui/pointer_in_nomem_asm_block.stderr

@@ -1,14 +1,11 @@
 error: passing pointer to nomem asm block
   --> tests/ui/pointer_in_nomem_asm_block.rs:8:9
    |
-LL |           p1 = in(reg) p,
-   |           ^^^^^^^^^^^^^^
-LL |           p2 = in(reg) p as *const _ as usize,
-LL |           p3 = in(reg) p,
-   |           ^^^^^^^^^^^^^^
-LL | /         options(nomem, nostack, preserves_flags)
-LL | |     );
-   | |_____- help: remove `nomem`
+LL |         p1 = in(reg) p,
+   |         ^^^^^^^^^^^^^^
+LL |         p2 = in(reg) p as *const _ as usize,
+LL |         p3 = in(reg) p,
+   |         ^^^^^^^^^^^^^^
    |
    = note: `-D clippy::pointer-in-nomem-asm-block` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::pointer_in_nomem_asm_block)]`
@@ -17,7 +14,7 @@ error: passing pointer to nomem asm block
   --> tests/ui/pointer_in_nomem_asm_block.rs:33:34
    |
 LL |     core::arch::asm!("asdf {p}", p = in(reg) p, options(nomem, nostack, preserves_flags));
-   |                                  ^^^^^^^^^^^^^  ----------------------------------------- help: remove `nomem`
+   |                                  ^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors