Skip to content

Commit

Permalink
Rollup merge of #105023 - tmiasko:asm-sym-static-reachable, r=wesleyw…
Browse files Browse the repository at this point in the history
…iser

Statics used in reachable function's inline asm are reachable

Fixes #104925.
  • Loading branch information
matthiaskrgr authored Nov 29, 2022
2 parents 804fa66 + 63915be commit 581ca3e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
11 changes: 11 additions & 0 deletions compiler/rustc_passes/src/reachable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,17 @@ impl<'tcx> Visitor<'tcx> for ReachableContext<'tcx> {

intravisit::walk_expr(self, expr)
}

fn visit_inline_asm(&mut self, asm: &'tcx hir::InlineAsm<'tcx>, id: hir::HirId) {
for (op, _) in asm.operands {
if let hir::InlineAsmOperand::SymStatic { def_id, .. } = op {
if let Some(def_id) = def_id.as_local() {
self.reachable_symbols.insert(def_id);
}
}
}
intravisit::walk_inline_asm(self, asm, id);
}
}

impl<'tcx> ReachableContext<'tcx> {
Expand Down
20 changes: 20 additions & 0 deletions src/test/codegen-units/item-collection/asm-sym.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// needs-asm-support
// compile-flags: -Ccodegen-units=1 -Zprint-mono-items=lazy --crate-type=lib

#[inline(always)]
pub unsafe fn f() {
//~ MONO_ITEM static f::S @@ asm_sym-cgu.0[External]
static S: usize = 1;
//~ MONO_ITEM fn f::fun @@ asm_sym-cgu.0[External]
fn fun() {}
core::arch::asm!("/* {0} {1} */", sym S, sym fun);
}

//~ MONO_ITEM fn g @@ asm_sym-cgu.0[External]
pub unsafe fn g() {
//~ MONO_ITEM static g::S @@ asm_sym-cgu.0[Internal]
static S: usize = 2;
//~ MONO_ITEM fn g::fun @@ asm_sym-cgu.0[Internal]
fn fun() {}
core::arch::asm!("/* {0} {1} */", sym S, sym fun);
}

0 comments on commit 581ca3e

Please sign in to comment.