Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass InferCtxt to InlineAsmCtxt to properly taint on error #138138

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Pass InferCtxt to InlineAsmCtxt to properly taint on error #138138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 58 additions & 52 deletions compiler/rustc_hir_analysis/src/check/intrinsicck.rs
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 2 additions & 13 deletions compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,22 +99,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
debug!("FnCtxt::check_asm: {} deferred checks", deferred_asm_checks.len());
for (asm, hir_id) in deferred_asm_checks.drain(..) {
let enclosing_id = self.tcx.hir_enclosing_body_owner(hir_id);
let expr_ty = |expr: &hir::Expr<'tcx>| {
let ty = self.typeck_results.borrow().expr_ty_adjusted(expr);
let ty = self.resolve_vars_if_possible(ty);
if ty.has_non_region_infer() {
Ty::new_misc_error(self.tcx)
} else {
self.tcx.erase_regions(ty)
}
};
let node_ty = |hir_id: HirId| self.typeck_results.borrow().node_type(hir_id);
InlineAsmCtxt::new(
self.tcx,
enclosing_id,
&self.infcx,
self.typing_env(self.param_env),
expr_ty,
node_ty,
&*self.typeck_results.borrow(),
)
.check_asm(asm);
}
Expand Down
8 changes: 7 additions & 1 deletion tests/ui/asm/invalid-const-operand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ global_asm!("{}", const 0f32);
global_asm!("{}", const 0 as *mut u8);
//~^ ERROR invalid type for `const` operand

fn main() {
fn test1() {
unsafe {
// Const operands must be integers and must be constants.

Expand All @@ -27,7 +27,11 @@ fn main() {
//~^ ERROR invalid type for `const` operand
asm!("{}", const &0);
//~^ ERROR invalid type for `const` operand
}
}

fn test2() {
unsafe {
// Constants must be... constant

let x = 0;
Expand All @@ -47,3 +51,5 @@ fn main() {
//~^ ERROR attempt to use a non-constant value in a constant
}
}

fn main() {}
8 changes: 4 additions & 4 deletions tests/ui/asm/invalid-const-operand.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/invalid-const-operand.rs:40:26
--> $DIR/invalid-const-operand.rs:44:26
|
LL | asm!("{}", const x);
| ^ non-constant value
Expand All @@ -11,7 +11,7 @@ LL + const x: /* Type */ = 0;
|

error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/invalid-const-operand.rs:43:36
--> $DIR/invalid-const-operand.rs:47:36
|
LL | asm!("{}", const const_foo(x));
| ^ non-constant value
Expand All @@ -23,7 +23,7 @@ LL + const x: /* Type */ = 0;
|

error[E0435]: attempt to use a non-constant value in a constant
--> $DIR/invalid-const-operand.rs:46:36
--> $DIR/invalid-const-operand.rs:50:36
|
LL | asm!("{}", const const_bar(x));
| ^ non-constant value
Expand Down Expand Up @@ -80,7 +80,7 @@ error: invalid type for `const` operand
LL | asm!("{}", const &0);
| ^^^^^^--
| |
| is a `&{integer}`
| is a `&i32`
|
= help: `const` operands must be of an integer type

Expand Down
13 changes: 13 additions & 0 deletions tests/ui/asm/tainting-on-error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//@ needs-asm-support

use std::arch::asm;

fn main() {
unsafe {
asm!(
"/* {} */",
sym None::<()>,
//~^ ERROR invalid `sym` operand
);
}
}
10 changes: 10 additions & 0 deletions tests/ui/asm/tainting-on-error.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
error: invalid `sym` operand
--> $DIR/tainting-on-error.rs:9:13
|
LL | sym None::<()>,
| ^^^^^^^^^^^^^^ is an `Option<()>`
|
= help: `sym` operands must refer to either a function or a static

error: aborting due to 1 previous error

8 changes: 7 additions & 1 deletion tests/ui/asm/x86_64/type-check-2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::arch::{asm, global_asm};
#[repr(simd)]
struct SimdNonCopy([f32; 4]);

fn main() {
fn test1() {
unsafe {
// Inputs must be initialized

Expand All @@ -26,7 +26,11 @@ fn main() {
asm!("{}", in(reg) v[0]);
asm!("{}", out(reg) v[0]);
asm!("{}", inout(reg) v[0]);
}
}

fn test2() {
unsafe {
// Register operands must be Copy

asm!("{}", in(xmm_reg) SimdNonCopy([0.0, 0.0, 0.0, 0.0]));
Expand Down Expand Up @@ -68,3 +72,5 @@ fn main() {
asm!("{}", in(reg) u);
}
}

fn main() {}
16 changes: 8 additions & 8 deletions tests/ui/asm/x86_64/type-check-2.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
error: arguments for inline assembly must be copyable
--> $DIR/type-check-2.rs:32:32
--> $DIR/type-check-2.rs:36:32
|
LL | asm!("{}", in(xmm_reg) SimdNonCopy([0.0, 0.0, 0.0, 0.0]));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `SimdNonCopy` does not implement the Copy trait

error: cannot use value of type `{closure@$DIR/type-check-2.rs:44:28: 44:36}` for inline assembly
--> $DIR/type-check-2.rs:44:28
error: cannot use value of type `{closure@$DIR/type-check-2.rs:48:28: 48:36}` for inline assembly
--> $DIR/type-check-2.rs:48:28
|
LL | asm!("{}", in(reg) |x: i32| x);
| ^^^^^^^^^^
|
= note: only integers, floats, SIMD vectors, pointers and function pointers can be used as arguments for inline assembly

error: cannot use value of type `Vec<i32>` for inline assembly
--> $DIR/type-check-2.rs:46:28
--> $DIR/type-check-2.rs:50:28
|
LL | asm!("{}", in(reg) vec![0]);
| ^^^^^^^
Expand All @@ -24,31 +24,31 @@ LL | asm!("{}", in(reg) vec![0]);
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)

error: cannot use value of type `(i32, i32, i32)` for inline assembly
--> $DIR/type-check-2.rs:48:28
--> $DIR/type-check-2.rs:52:28
|
LL | asm!("{}", in(reg) (1, 2, 3));
| ^^^^^^^^^
|
= note: only integers, floats, SIMD vectors, pointers and function pointers can be used as arguments for inline assembly

error: cannot use value of type `[i32; 3]` for inline assembly
--> $DIR/type-check-2.rs:50:28
--> $DIR/type-check-2.rs:54:28
|
LL | asm!("{}", in(reg) [1, 2, 3]);
| ^^^^^^^^^
|
= note: only integers, floats, SIMD vectors, pointers and function pointers can be used as arguments for inline assembly

error: cannot use value of type `fn() {main}` for inline assembly
--> $DIR/type-check-2.rs:58:31
--> $DIR/type-check-2.rs:62:31
|
LL | asm!("{}", inout(reg) f);
| ^
|
= note: only integers, floats, SIMD vectors, pointers and function pointers can be used as arguments for inline assembly

error: cannot use value of type `&mut i32` for inline assembly
--> $DIR/type-check-2.rs:61:31
--> $DIR/type-check-2.rs:65:31
|
LL | asm!("{}", inout(reg) r);
| ^
Expand Down
Loading