Skip to content

Commit ef031c8

Browse files
Exclude global_asm from mir_keys
1 parent c867b8f commit ef031c8

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

compiler/rustc_mir_transform/src/lib.rs

+4
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,10 @@ fn mir_keys(tcx: TyCtxt<'_>, (): ()) -> FxIndexSet<LocalDefId> {
316316
// All body-owners have MIR associated with them.
317317
let mut set: FxIndexSet<_> = tcx.hir_body_owners().collect();
318318

319+
// Remove the fake bodies for `global_asm!`, since they're not useful
320+
// to be emitted (`--emit=mir`) or encoded (in metadata).
321+
set.retain(|&def_id| !matches!(tcx.def_kind(def_id), DefKind::GlobalAsm));
322+
319323
// Coroutine-closures (e.g. async closures) have an additional by-move MIR
320324
// body that isn't in the HIR.
321325
for body_owner in tcx.hir_body_owners() {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//@ revisions: emit_mir instrument cfi
2+
3+
// Make sure we don't try to emit MIR for it.
4+
//@[emit_mir] compile-flags: --emit=mir
5+
6+
// Make sure we don't try to instrument it.
7+
//@[instrument] compile-flags: -Cinstrument-coverage -Zno-profiler-runtime
8+
//@[instrument] only-linux
9+
10+
// Make sure we don't try to CFI encode it.
11+
//@[cfi] compile-flags: -Zsanitizer=cfi -Ccodegen-units=1 -Clto -Ctarget-feature=-crt-static -Clink-dead-code=true
12+
//@[cfi] needs-sanitizer-cfi
13+
//@[cfi] no-prefer-dynamic
14+
// FIXME(#122848) Remove only-linux once OSX CFI binaries work
15+
//@[cfi] only-linux
16+
17+
//@ build-pass
18+
//@ needs-asm-support
19+
20+
use std::arch::global_asm;
21+
22+
fn foo() {}
23+
24+
global_asm!("/* {} */", sym foo);
25+
26+
fn main() {}

tests/ui/asm/global-asm-with-error.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0425]: cannot find value `a` in this scope
2-
--> $DIR/global-asm-with-error.rs:6:29
2+
--> $DIR/global-asm-with-error.rs:8:29
33
|
44
LL | global_asm!("/* {} */", sym a);
55
| ^ not found in this scope

0 commit comments

Comments
 (0)