Skip to content

Commit f0ca5d4

Browse files
borsbors
committed
Auto merge of #41305 - frewsxcv:rollup, r=frewsxcv
Rollup of 4 pull requests - Successful merges: #40702, #41172, #41249, #41303 - Failed merges:
2 parents bbdaad0 + 13dc855 commit f0ca5d4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+789
-67
lines changed

Diff for: ‎src/doc/unstable-book/src/SUMMARY.md

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
- [future_atomic_orderings](future-atomic-orderings.md)
8484
- [generic_param_attrs](generic-param-attrs.md)
8585
- [get_type_id](get-type-id.md)
86+
- [global_asm](global_asm.md)
8687
- [heap_api](heap-api.md)
8788
- [i128](i128.md)
8889
- [i128_type](i128-type.md)

Diff for: ‎src/doc/unstable-book/src/asm.md

+2
Original file line numberDiff line numberDiff line change
@@ -189,3 +189,5 @@ constraints, etc.
189189

190190
[llvm-docs]: http://llvm.org/docs/LangRef.html#inline-assembler-expressions
191191

192+
If you need more power and don't mind losing some of the niceties of
193+
`asm!`, check out [global_asm](global_asm.html).

Diff for: ‎src/doc/unstable-book/src/global_asm.md

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# `global_asm`
2+
3+
The tracking issue for this feature is: [#35119]
4+
5+
[#35119]: https://github.com/rust-lang/rust/issues/35119
6+
7+
------------------------
8+
9+
The `global_asm!` macro allows the programmer to write arbitrary
10+
assembly outside the scope of a function body, passing it through
11+
`rustc` and `llvm` to the assembler. The macro is a no-frills
12+
interface to LLVM's concept of [module-level inline assembly]. That is,
13+
all caveats applicable to LLVM's module-level inline assembly apply
14+
to `global_asm!`.
15+
16+
[module-level inline assembly]: http://llvm.org/docs/LangRef.html#module-level-inline-assembly
17+
18+
`global_asm!` fills a role not currently satisfied by either `asm!`
19+
or `#[naked]` functions. The programmer has _all_ features of the
20+
assembler at their disposal. The linker will expect to resolve any
21+
symbols defined in the inline assembly, modulo any symbols marked as
22+
external. It also means syntax for directives and assembly follow the
23+
conventions of the assembler in your toolchain.
24+
25+
A simple usage looks like this:
26+
27+
```rust,ignore
28+
# #![feature(global_asm)]
29+
# you also need relevant target_arch cfgs
30+
global_asm!(include_str!("something_neato.s"));
31+
```
32+
33+
And a more complicated usage looks like this:
34+
35+
```rust,ignore
36+
# #![feature(global_asm)]
37+
# #![cfg(any(target_arch = "x86", target_arch = "x86_64"))]
38+
39+
pub mod sally {
40+
global_asm!(r#"
41+
.global foo
42+
foo:
43+
jmp baz
44+
"#);
45+
46+
#[no_mangle]
47+
pub unsafe extern "C" fn baz() {}
48+
}
49+
50+
// the symbols `foo` and `bar` are global, no matter where
51+
// `global_asm!` was used.
52+
extern "C" {
53+
fn foo();
54+
fn bar();
55+
}
56+
57+
pub mod harry {
58+
global_asm!(r#"
59+
.global bar
60+
bar:
61+
jmp quux
62+
"#);
63+
64+
#[no_mangle]
65+
pub unsafe extern "C" fn quux() {}
66+
}
67+
```
68+
69+
You may use `global_asm!` multiple times, anywhere in your crate, in
70+
whatever way suits you. The effect is as if you concatenated all
71+
usages and placed the larger, single usage in the crate root.
72+
73+
------------------------
74+
75+
If you don't need quite as much power and flexibility as
76+
`global_asm!` provides, and you don't mind restricting your inline
77+
assembly to `fn` bodies only, you might try the [asm](asm.html)
78+
feature instead.

Diff for: ‎src/librustc/hir/def.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ pub enum Def {
5757
// Macro namespace
5858
Macro(DefId, MacroKind),
5959

60+
GlobalAsm(DefId),
61+
6062
// Both namespaces
6163
Err,
6264
}
@@ -144,7 +146,8 @@ impl Def {
144146
Def::Variant(id) | Def::VariantCtor(id, ..) | Def::Enum(id) | Def::TyAlias(id) |
145147
Def::AssociatedTy(id) | Def::TyParam(id) | Def::Struct(id) | Def::StructCtor(id, ..) |
146148
Def::Union(id) | Def::Trait(id) | Def::Method(id) | Def::Const(id) |
147-
Def::AssociatedConst(id) | Def::Local(id) | Def::Upvar(id, ..) | Def::Macro(id, ..) => {
149+
Def::AssociatedConst(id) | Def::Local(id) | Def::Upvar(id, ..) | Def::Macro(id, ..) |
150+
Def::GlobalAsm(id) => {
148151
id
149152
}
150153

@@ -185,6 +188,7 @@ impl Def {
185188
Def::Label(..) => "label",
186189
Def::SelfTy(..) => "self type",
187190
Def::Macro(..) => "macro",
191+
Def::GlobalAsm(..) => "global asm",
188192
Def::Err => "unresolved item",
189193
}
190194
}

Diff for: ‎src/librustc/hir/intravisit.rs

+3
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,9 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) {
474474
visitor.visit_id(item.id);
475475
walk_list!(visitor, visit_foreign_item, &foreign_module.items);
476476
}
477+
ItemGlobalAsm(_) => {
478+
visitor.visit_id(item.id);
479+
}
477480
ItemTy(ref typ, ref type_parameters) => {
478481
visitor.visit_id(item.id);
479482
visitor.visit_ty(typ);

Diff for: ‎src/librustc/hir/lowering.rs

+8
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,13 @@ impl<'a> LoweringContext<'a> {
646646
}
647647
}
648648

649+
fn lower_global_asm(&mut self, ga: &GlobalAsm) -> P<hir::GlobalAsm> {
650+
P(hir::GlobalAsm {
651+
asm: ga.asm,
652+
ctxt: ga.ctxt,
653+
})
654+
}
655+
649656
fn lower_variant(&mut self, v: &Variant) -> hir::Variant {
650657
Spanned {
651658
node: hir::Variant_ {
@@ -1288,6 +1295,7 @@ impl<'a> LoweringContext<'a> {
12881295
}
12891296
ItemKind::Mod(ref m) => hir::ItemMod(self.lower_mod(m)),
12901297
ItemKind::ForeignMod(ref nm) => hir::ItemForeignMod(self.lower_foreign_mod(nm)),
1298+
ItemKind::GlobalAsm(ref ga) => hir::ItemGlobalAsm(self.lower_global_asm(ga)),
12911299
ItemKind::Ty(ref t, ref generics) => {
12921300
hir::ItemTy(self.lower_ty(t), self.lower_generics(generics))
12931301
}

Diff for: ‎src/librustc/hir/map/def_collector.rs

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
109109
DefPathData::ValueNs(i.ident.name.as_str()),
110110
ItemKind::MacroDef(..) => DefPathData::MacroDef(i.ident.name.as_str()),
111111
ItemKind::Mac(..) => return self.visit_macro_invoc(i.id, false),
112+
ItemKind::GlobalAsm(..) => DefPathData::Misc,
112113
ItemKind::Use(ref view_path) => {
113114
match view_path.node {
114115
ViewPathGlob(..) => {}

Diff for: ‎src/librustc/hir/map/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1077,6 +1077,7 @@ fn node_id_to_string(map: &Map, id: NodeId, include_id: bool) -> String {
10771077
ItemFn(..) => "fn",
10781078
ItemMod(..) => "mod",
10791079
ItemForeignMod(..) => "foreign mod",
1080+
ItemGlobalAsm(..) => "global asm",
10801081
ItemTy(..) => "ty",
10811082
ItemEnum(..) => "enum",
10821083
ItemStruct(..) => "struct",

Diff for: ‎src/librustc/hir/mod.rs

+9
Original file line numberDiff line numberDiff line change
@@ -1495,6 +1495,12 @@ pub struct ForeignMod {
14951495
pub items: HirVec<ForeignItem>,
14961496
}
14971497

1498+
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
1499+
pub struct GlobalAsm {
1500+
pub asm: Symbol,
1501+
pub ctxt: SyntaxContext,
1502+
}
1503+
14981504
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
14991505
pub struct EnumDef {
15001506
pub variants: HirVec<Variant>,
@@ -1686,6 +1692,8 @@ pub enum Item_ {
16861692
ItemMod(Mod),
16871693
/// An external module
16881694
ItemForeignMod(ForeignMod),
1695+
/// Module-level inline assembly (from global_asm!)
1696+
ItemGlobalAsm(P<GlobalAsm>),
16891697
/// A type alias, e.g. `type Foo = Bar<u8>`
16901698
ItemTy(P<Ty>, Generics),
16911699
/// An enum definition, e.g. `enum Foo<A, B> {C<A>, D<B>}`
@@ -1720,6 +1728,7 @@ impl Item_ {
17201728
ItemFn(..) => "function",
17211729
ItemMod(..) => "module",
17221730
ItemForeignMod(..) => "foreign module",
1731+
ItemGlobalAsm(..) => "global asm",
17231732
ItemTy(..) => "type alias",
17241733
ItemEnum(..) => "enum",
17251734
ItemStruct(..) => "struct",

Diff for: ‎src/librustc/hir/print.rs

+5
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,11 @@ impl<'a> State<'a> {
633633
self.print_foreign_mod(nmod, &item.attrs)?;
634634
self.bclose(item.span)?;
635635
}
636+
hir::ItemGlobalAsm(ref ga) => {
637+
self.head(&visibility_qualified(&item.vis, "global asm"))?;
638+
word(&mut self.s, &ga.asm.as_str())?;
639+
self.end()?
640+
}
636641
hir::ItemTy(ref ty, ref params) => {
637642
self.ibox(indent_unit)?;
638643
self.ibox(0)?;

Diff for: ‎src/librustc/ich/impls_hir.rs

+16
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,7 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a, 'tcx>> for hir::Item {
881881
hir::ItemFn(..) |
882882
hir::ItemMod(..) |
883883
hir::ItemForeignMod(..) |
884+
hir::ItemGlobalAsm(..) |
884885
hir::ItemTy(..) |
885886
hir::ItemEnum(..) |
886887
hir::ItemStruct(..) |
@@ -925,6 +926,7 @@ impl_stable_hash_for!(enum hir::Item_ {
925926
ItemFn(fn_decl, unsafety, constness, abi, generics, body_id),
926927
ItemMod(module),
927928
ItemForeignMod(foreign_mod),
929+
ItemGlobalAsm(global_asm),
928930
ItemTy(ty, generics),
929931
ItemEnum(enum_def, generics),
930932
ItemStruct(variant_data, generics),
@@ -1014,6 +1016,19 @@ impl_stable_hash_for!(struct hir::InlineAsmOutput {
10141016
is_indirect
10151017
});
10161018

1019+
impl<'a, 'tcx> HashStable<StableHashingContext<'a, 'tcx>> for hir::GlobalAsm {
1020+
fn hash_stable<W: StableHasherResult>(&self,
1021+
hcx: &mut StableHashingContext<'a, 'tcx>,
1022+
hasher: &mut StableHasher<W>) {
1023+
let hir::GlobalAsm {
1024+
asm,
1025+
ctxt: _
1026+
} = *self;
1027+
1028+
asm.hash_stable(hcx, hasher);
1029+
}
1030+
}
1031+
10171032
impl<'a, 'tcx> HashStable<StableHashingContext<'a, 'tcx>> for hir::InlineAsm {
10181033
fn hash_stable<W: StableHasherResult>(&self,
10191034
hcx: &mut StableHashingContext<'a, 'tcx>,
@@ -1070,6 +1085,7 @@ impl_stable_hash_for!(enum hir::def::Def {
10701085
Upvar(def_id, index, expr_id),
10711086
Label(node_id),
10721087
Macro(def_id, macro_kind),
1088+
GlobalAsm(def_id),
10731089
Err
10741090
});
10751091

Diff for: ‎src/librustc/middle/reachable.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> {
267267
hir::ItemMod(..) | hir::ItemForeignMod(..) |
268268
hir::ItemImpl(..) | hir::ItemTrait(..) |
269269
hir::ItemStruct(..) | hir::ItemEnum(..) |
270-
hir::ItemUnion(..) | hir::ItemDefaultImpl(..) => {}
270+
hir::ItemUnion(..) | hir::ItemDefaultImpl(..) |
271+
hir::ItemGlobalAsm(..) => {}
271272
}
272273
}
273274
hir_map::NodeTraitItem(trait_method) => {

Diff for: ‎src/librustc/middle/resolve_lifetime.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,8 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
314314
hir::ItemUse(..) |
315315
hir::ItemMod(..) |
316316
hir::ItemDefaultImpl(..) |
317-
hir::ItemForeignMod(..) => {
317+
hir::ItemForeignMod(..) |
318+
hir::ItemGlobalAsm(..) => {
318319
// These sorts of items have no lifetime parameters at all.
319320
intravisit::walk_item(self, item);
320321
}

Diff for: ‎src/librustc_back/target/wasm32_unknown_emscripten.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use super::emscripten_base::{cmd};
1414

1515
pub fn target() -> Result<Target, String> {
1616
let mut post_link_args = LinkArgs::new();
17-
post_link_args.insert(LinkerFlavor::Gcc,
17+
post_link_args.insert(LinkerFlavor::Em,
1818
vec!["-s".to_string(),
1919
"BINARYEN=1".to_string(),
2020
"-s".to_string(),

Diff for: ‎src/librustc_driver/test.rs

+1
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ impl<'a, 'gcx, 'tcx> Env<'a, 'gcx, 'tcx> {
233233
hir::ItemStatic(..) |
234234
hir::ItemFn(..) |
235235
hir::ItemForeignMod(..) |
236+
hir::ItemGlobalAsm(..) |
236237
hir::ItemTy(..) => None,
237238

238239
hir::ItemEnum(..) |

Diff for: ‎src/librustc_llvm/ffi.rs

+1
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,7 @@ extern "C" {
507507

508508
/// See Module::setModuleInlineAsm.
509509
pub fn LLVMSetModuleInlineAsm(M: ModuleRef, Asm: *const c_char);
510+
pub fn LLVMRustAppendModuleInlineAsm(M: ModuleRef, Asm: *const c_char);
510511

511512
/// See llvm::LLVMTypeKind::getTypeID.
512513
pub fn LLVMRustGetTypeKind(Ty: TypeRef) -> TypeKind;

Diff for: ‎src/librustc_metadata/decoder.rs

+1
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ impl<'tcx> EntryKind<'tcx> {
429429
EntryKind::Trait(_) => Def::Trait(did),
430430
EntryKind::Enum(..) => Def::Enum(did),
431431
EntryKind::MacroDef(_) => Def::Macro(did, MacroKind::Bang),
432+
EntryKind::GlobalAsm => Def::GlobalAsm(did),
432433

433434
EntryKind::ForeignMod |
434435
EntryKind::Impl(_) |

Diff for: ‎src/librustc_metadata/encoder.rs

+2
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@ impl<'a, 'b: 'a, 'tcx: 'b> EntryBuilder<'a, 'b, 'tcx> {
677677
return self.encode_info_for_mod(FromId(item.id, (m, &item.attrs, &item.vis)));
678678
}
679679
hir::ItemForeignMod(_) => EntryKind::ForeignMod,
680+
hir::ItemGlobalAsm(..) => EntryKind::GlobalAsm,
680681
hir::ItemTy(..) => EntryKind::Type,
681682
hir::ItemEnum(..) => EntryKind::Enum(get_repr_options(&tcx, def_id)),
682683
hir::ItemStruct(ref struct_def, _) => {
@@ -917,6 +918,7 @@ impl<'a, 'b, 'tcx> IndexBuilder<'a, 'b, 'tcx> {
917918
hir::ItemFn(..) |
918919
hir::ItemMod(..) |
919920
hir::ItemForeignMod(..) |
921+
hir::ItemGlobalAsm(..) |
920922
hir::ItemExternCrate(..) |
921923
hir::ItemUse(..) |
922924
hir::ItemDefaultImpl(..) |

Diff for: ‎src/librustc_metadata/schema.rs

+2
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ pub enum EntryKind<'tcx> {
267267
ForeignImmStatic,
268268
ForeignMutStatic,
269269
ForeignMod,
270+
GlobalAsm,
270271
Type,
271272
Enum(ReprOptions),
272273
Field,
@@ -297,6 +298,7 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a, 'tcx>> for EntryKind<'tcx> {
297298
EntryKind::ForeignImmStatic |
298299
EntryKind::ForeignMutStatic |
299300
EntryKind::ForeignMod |
301+
EntryKind::GlobalAsm |
300302
EntryKind::Field |
301303
EntryKind::Type => {
302304
// Nothing else to hash here.

Diff for: ‎src/librustc_privacy/lib.rs

+11-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,10 @@ impl<'a, 'tcx> Visitor<'tcx> for EmbargoVisitor<'a, 'tcx> {
160160
self.prev_level
161161
}
162162
// Other `pub` items inherit levels from parents
163-
_ => {
163+
hir::ItemConst(..) | hir::ItemEnum(..) | hir::ItemExternCrate(..) |
164+
hir::ItemGlobalAsm(..) | hir::ItemFn(..) | hir::ItemMod(..) |
165+
hir::ItemStatic(..) | hir::ItemStruct(..) | hir::ItemTrait(..) |
166+
hir::ItemTy(..) | hir::ItemUnion(..) | hir::ItemUse(..) => {
164167
if item.vis == hir::Public { self.prev_level } else { None }
165168
}
166169
};
@@ -212,7 +215,9 @@ impl<'a, 'tcx> Visitor<'tcx> for EmbargoVisitor<'a, 'tcx> {
212215
}
213216
}
214217
}
215-
_ => {}
218+
hir::ItemUse(..) | hir::ItemStatic(..) | hir::ItemConst(..) |
219+
hir::ItemGlobalAsm(..) | hir::ItemTy(..) | hir::ItemMod(..) |
220+
hir::ItemFn(..) | hir::ItemExternCrate(..) | hir::ItemDefaultImpl(..) => {}
216221
}
217222

218223
// Mark all items in interfaces of reachable items as reachable
@@ -225,6 +230,8 @@ impl<'a, 'tcx> Visitor<'tcx> for EmbargoVisitor<'a, 'tcx> {
225230
hir::ItemUse(..) => {}
226231
// The interface is empty
227232
hir::ItemDefaultImpl(..) => {}
233+
// The interface is empty
234+
hir::ItemGlobalAsm(..) => {}
228235
// Visit everything
229236
hir::ItemConst(..) | hir::ItemStatic(..) |
230237
hir::ItemFn(..) | hir::ItemTy(..) => {
@@ -1092,6 +1099,8 @@ impl<'a, 'tcx> Visitor<'tcx> for PrivateItemsInPublicInterfacesVisitor<'a, 'tcx>
10921099
hir::ItemMod(..) => {}
10931100
// Checked in resolve
10941101
hir::ItemUse(..) => {}
1102+
// No subitems
1103+
hir::ItemGlobalAsm(..) => {}
10951104
// Subitems of these items have inherited publicity
10961105
hir::ItemConst(..) | hir::ItemStatic(..) | hir::ItemFn(..) |
10971106
hir::ItemTy(..) => {

Diff for: ‎src/librustc_resolve/build_reduced_graph.rs

+2
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,8 @@ impl<'a> Resolver<'a> {
268268
self.define(parent, ident, TypeNS, imported_binding);
269269
}
270270

271+
ItemKind::GlobalAsm(..) => {}
272+
271273
ItemKind::Mod(..) if item.ident == keywords::Invalid.ident() => {} // Crate root
272274

273275
ItemKind::Mod(..) => {

Diff for: ‎src/librustc_resolve/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,7 @@ impl<'a> Resolver<'a> {
17091709
}
17101710
}
17111711

1712-
ItemKind::ExternCrate(_) | ItemKind::MacroDef(..) => {
1712+
ItemKind::ExternCrate(_) | ItemKind::MacroDef(..) | ItemKind::GlobalAsm(_)=> {
17131713
// do nothing, these are just around to be encoded
17141714
}
17151715

0 commit comments

Comments
 (0)