Commit Graph

1289 Commits

Author SHA1 Message Date
Camille GILLOT
03c02be0a7 Move rustc_middle::middle::cstore to rustc_session. 2021-10-03 16:08:51 +02:00
bjorn3
dbeafcc254 Rustfmt 2021-10-02 14:51:08 +02:00
bjorn3
d76afa705b Sync from rust a8387aef8c 2021-10-02 14:42:18 +02:00
bjorn3
eded369086 Update Cranelift
This version no longer has the old x86 backend
2021-10-01 15:37:48 +02:00
Camille GILLOT
04f3839596 Move EncodedMetadata to rustc_metadata. 2021-09-30 19:41:32 +02:00
Camille GILLOT
745dee9d3e Move encode_metadata out of CrateStore. 2021-09-30 19:41:31 +02:00
bjorn3
adc2793e7d Fix unused import warning
TryInto is part of the 2021 edition prelude
2021-09-27 11:20:04 +02:00
bjorn3
89fedb1e4d Sync from rust 04006d8e3b 2021-09-27 11:11:18 +02:00
bors
500e22e340 Auto merge of #89092 - bjorn3:sync_cg_clif-2021-09-19, r=bjorn3
Sync rustc_codegen_cranelift

Nothing exciting this time. Mostly internal refactorings.

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
2021-09-26 23:31:01 +00:00
Gary Guo
1b34e2d678 Introduce Rvalue::ShallowInitBox 2021-09-25 01:08:41 +01:00
Mark Rousskov
29e08971ce Adjust to SourceType::InTree in several places
These were left over in migrations to subtrees, which should generally be treated
as-if it was local.

Also fixes a warning caused by this change.
2021-09-20 08:45:39 -04:00
bjorn3
5d3b8e7c1b Merge commit '61667dedf55e3e5aa584f7ae2bd0471336b92ce9' into sync_cg_clif-2021-09-19 2021-09-19 13:56:58 +02:00
bjorn3
f12c51f149 Sync from rust 7a3d1a5f3d 2021-09-19 13:43:54 +02:00
Eduard-Mihai Burtescu
e857fabac1 Querify fn_abi_of_{fn_ptr,instance}. 2021-09-18 04:41:33 +03:00
Eduard-Mihai Burtescu
849b4c4483 ty::layout: replicate layout_of setup for fn_abi_of_{fn_ptr,instance}. 2021-09-18 04:41:29 +03:00
Eduard-Mihai Burtescu
1b8e830f6d ty::layout: intern FnAbis as &'tcx. 2021-09-18 01:42:45 +03:00
bors
02d3c132ae Auto merge of #88839 - nbdd0121:alignof, r=nagisa
Introduce NullOp::AlignOf

This PR introduces `Rvalue::NullaryOp(NullOp::AlignOf, ty)`, which will be lowered from `align_of`, similar to `size_of` lowering to `Rvalue::NullaryOp(NullOp::SizeOf, ty)`.

The changes are originally part of #88700 but since it's not dependent on other changes and could have performance impact on its own, it's separated into its own PR.
2021-09-12 23:49:24 +00:00
Gary Guo
4ac4980b33 Introduce NullOp::AlignOf 2021-09-13 00:08:35 +01:00
bjorn3
94ad37cd3d Sync from rust c7dbe7a830 2021-09-12 19:25:17 +02:00
Andreas Liljeqvist
a81217c12d Make abi::Abi Copy and remove a *lot* of refs
fix

fix

Remove more refs and clones

fix

more

fix
2021-09-09 10:41:19 +02:00
bjorn3
7736e0afb8 Avoid unnecessary duplicate metadata encoding 2021-09-08 18:54:48 +02:00
bjorn3
95f06887ea Sync from rust 73641cd23b 2021-09-07 20:45:09 +02:00
Camille GILLOT
9ad50a41fe Move the dataflow framework to its own crate. 2021-09-07 19:57:07 +02:00
bors
0167838a18 Auto merge of #88499 - eddyb:layout-off, r=nagisa
Provide `layout_of` automatically (given tcx + param_env + error handling).

After #88337, there's no longer any uses of `LayoutOf` within `rustc_target` itself, so I realized I could move the trait to `rustc_middle::ty::layout` and redesign it a bit.

This is similar to #88338 (and supersedes it), but at no ergonomic loss, since there's no funky `C: LayoutOf<Ty = Ty>` -> `Ty: TyAbiInterface<C>` generic `impl` chain, and each `LayoutOf` still corresponds to one `impl` (of `LayoutOfHelpers`) for the specific context.

After this PR, this is what's needed to get `trait LayoutOf` (with the `layout_of` method) implemented on some context type:
* `TyCtxt`, via `HasTyCtxt`
* `ParamEnv`, via `HasParamEnv`
* a way to transform `LayoutError`s into the desired error type
  * an error type of `!` can be paired with having `cx.layout_of(...)` return `TyAndLayout` *without* `Result<...>` around it, such as used by codegen
  * this is done through a new `LayoutOfHelpers` trait (and so is specifying the type of `cx.layout_of(...)`)

When going through this path (and not bypassing it with a manual `impl` of `LayoutOf`), the end result is that only the error case can be customized, the query itself and the success paths are guaranteed to be uniform.

(**EDIT**: just noticed that because of the supertrait relationship, you cannot actually implement `LayoutOf` yourself, the blanket `impl` fully covers all possible context types that could ever implement it)

Part of the motivation for this shape of API is that I've been working on querifying `FnAbi::of_*`, and what I want/need to introduce for that looks a lot like the setup in this PR - in particular, it's harder to express the `FnAbi` methods in `rustc_target`, since they're much more tied to `rustc` concepts.

r? `@nagisa` cc `@oli-obk` `@bjorn3`
2021-09-05 16:14:41 +00:00
bors
771c2c6986 Auto merge of #88559 - bjorn3:archive_logic_dedup, r=cjgillot
Move add_rlib and add_native_library to cg_ssa

This deduplicates logic between codegen backends.

cc `@antoyo` and `@khyperia` for cg_gcc and rust-gpu.
2021-09-05 04:37:12 +00:00
bors
e7e930360c Auto merge of #88363 - michaelwoerister:remapped-diagnostics, r=estebank
Path remapping: Make behavior of diagnostics output dependent on presence of --remap-path-prefix.

This PR fixes a regression (#87745) with `--remap-path-prefix` where the flag stopped causing diagnostic messages to be remapped as well. The regression was introduced in https://github.com/rust-lang/rust/pull/83813 where we erroneously assumed that remapping of diagnostic messages was not desired anymore (because #70642 partially undid that functionality with nobody objecting).

The issue is fixed by making `--remap-path-prefix` remap diagnostic messages again, including for paths that have been remapped in upstream crates (e.g. the standard library). This means that "sysroot-localization" (implemented in #70642) is also disabled if `rustc` is invoked with `--remap-path-prefix`. The assumption is that once someone starts explicitly remapping paths they also don't want paths to their local Rust installation in their build output.

In the future we might want to give more fine-grained control over this behavior via compiler flags (see https://github.com/rust-lang/rfcs/pull/3127 for a related RFC). For now this PR is intended as a regression fix.

This PR is an alternative to https://github.com/rust-lang/rust/pull/88191, which makes diagnostic messages be remapped unconditionally. That approach, however, would effectively revert #70642.

Fixes https://github.com/rust-lang/rust/issues/87745.

cc `@cbeuw`
r? `@ghost`
2021-09-03 00:23:10 +00:00
bjorn3
e6049759d0 Use in_incr_comp_dir_sess in cg_clif 2021-09-02 12:29:12 +02:00
Eduard-Mihai Burtescu
dc6c4defdc ty::layout: split LayoutOf into required and (blanket) provided halves. 2021-09-02 01:17:14 +03:00
Eduard-Mihai Burtescu
6a9c9b0f18 ty::layout: implement layout_of automatically as a default method. 2021-09-02 01:17:14 +03:00
Eduard-Mihai Burtescu
b710c0d48c rustc_target: move LayoutOf to ty::layout. 2021-09-02 01:17:14 +03:00
bjorn3
677c786109 Move add_rlib and add_native_library to cg_ssa
This deduplicates logic between codegen backends
2021-09-01 14:43:27 +02:00
bjorn3
0ff530eac8 Sync from rust 3ed6c1d23f 2021-09-01 14:00:09 +02:00
Eduard-Mihai Burtescu
39e16da529 rustc_target: TyAndLayout::field should never error. 2021-08-30 00:44:09 +03:00
bjorn3
e9eac6bd93 Remove unnecessary feature gates
One wasn't necessary anymore at all. Others are only necessary when jit mode is enabled.
2021-08-27 15:17:17 +02:00
bjorn3
6f5c9b97dc Enable some warnings 2021-08-27 14:04:00 +02:00
Eduard-Mihai Burtescu
d9f0448815 rustc_target: add lifetime parameter to LayoutOf. 2021-08-27 13:09:32 +03:00
Michael Woerister
7753eda91a Path remapping: Make behavior of diagnostics output dependent on presence of --remap-path-prefix. 2021-08-27 11:50:44 +02:00
lcnr
e0ea466661 make unevaluated const substs optional 2021-08-26 11:00:30 +02:00
bjorn3
f865bbbecf Sync from rust 9863bf51a5 2021-08-25 13:05:20 +02:00
bjorn3
47e4a62ac5 Move all code out of backend.rs 2021-08-20 21:43:53 +02:00
bjorn3
14617516f8 Make {Debug,Unwind}Context::emit non-generic 2021-08-20 21:38:50 +02:00
bjorn3
d8308ece36 Move Object creation into metadata.rs 2021-08-20 21:38:17 +02:00
bjorn3
a929c952d4 Add more architectures to with_object 2021-08-20 21:32:04 +02:00
bjorn3
d29e0484cf Revert "Remove unnecessary bailout in clif_pair_type_from_ty"
This reverts commit 3b22c3a8ec.

Seems to be necessary after all. At least when compiling regex.
2021-08-20 19:58:38 +02:00
bjorn3
3b22c3a8ec Remove unnecessary bailout in clif_pair_type_from_ty 2021-08-20 19:30:16 +02:00
bjorn3
7a781a53f0 Sync from rust 9ccf661694 2021-08-20 15:06:07 +02:00
Charles Lew
03ed8c8115 Fold vtable_trait_upcasting_coercion_new_vptr_slot logic into obligation processing. 2021-08-18 13:00:27 +08:00
Aaron Hill
1bfa59afe0 Update rustc_codegen_cratelift for working_dir change 2021-08-15 15:17:37 -05:00
Gary Guo
74b17685fe Implement black_box using intrinsic
The new implementation allows some `memcpy`s to be optimized away,
so the uninit value in ui/sanitize/memory.rs is constructed directly
onto the return place. Therefore the sanitizer now says that the
value is allocated by `main` rather than `random`.
2021-08-12 16:16:57 +01:00
bjorn3
d498e6d697 Avoid an unnecessary allocation 2021-08-10 13:19:22 +02:00
bjorn3
6681694cb5 Avoid converting filenames into strings where possible 2021-08-10 13:19:22 +02:00
bjorn3
1da50543dd Use the object crate for archive reading during archive building 2021-08-10 13:19:22 +02:00
bjorn3
d220159810 Merge commit '05677b6bd6c938ed760835d9b1f6514992654ae3' into sync_cg_clif-2021-08-06 2021-08-06 16:26:56 +02:00
bjorn3
05677b6bd6 Rustup to rustc 1.56.0-nightly (25b764849 2021-08-04) 2021-08-05 15:32:02 +02:00
bjorn3
20491379c2 Sync from rust 2ddb65c322 2021-08-05 14:39:37 +02:00
Charles Lew
6f682236c9 Implement pointer casting. 2021-08-03 01:09:37 +08:00
bjorn3
c6564f814e Fix float min and max operations in presence of NaN
Cranelift's fmin and fmax instructions propagate NaN, while Rust's min
and max don't.

Fixes #1049
2021-07-29 15:21:14 +02:00
bjorn3
e0b9f3b3cc Support storing return values in register places for all pass modes 2021-07-28 18:54:21 +02:00
bjorn3
b7881bb08d Remove CPlace::no_place
It is never the right function
2021-07-28 18:31:27 +02:00
bjorn3
8704a66922 Allow returning PassMode::Cast directly to an ssa var 2021-07-28 18:27:06 +02:00
bjorn3
bab224d254 Remove outdated FIXME 2021-07-28 18:26:03 +02:00
bjorn3
2e62516496 Remove workarounds for things unimplemented in Cranelift
Many are now implemented, so it is much nicer to directly use the
respective Cranelift instructions
2021-07-28 17:30:39 +02:00
bjorn3
8a6ff90a3a Use __muloti4 instead of __rust_i128_mulo
Fixes #1126
2021-07-28 14:54:31 +02:00
bjorn3
641e13e021 Replace pointer_ty() with fx.pointer_type where possible 2021-07-26 19:21:45 +02:00
bjorn3
e387ec9cbf Fix ABI for Indirect arguments
In case of PassMode::Indirect, the ownership of the backing storage is
transfered to the callee. This means that the caller must copy the
argument if it wants to use it again later.

Fixes #691
2021-07-26 18:57:48 +02:00
bjorn3
405642b853 Handle the extra argument for #[track_caller] earlier 2021-07-26 15:01:50 +02:00
bjorn3
3361e349fa Don't return anything from codegen_with_call_return_arg 2021-07-26 14:55:13 +02:00
bjorn3
83da1e0d5a Simplify logic around first_arg 2021-07-26 14:49:17 +02:00
bjorn3
050b417a74 Introduce the CallTarget enum 2021-07-26 14:40:27 +02:00
bjorn3
424a8c3a56 Implement "default_alloc_error_handler" feature
Fixes #1182
2021-07-26 14:11:19 +02:00
bjorn3
581e38b97c Add fixme 2021-07-25 19:12:31 +02:00
bjorn3
6d2221d1bb Fix simd_round implementation 2021-07-25 18:44:42 +02:00
bjorn3
90e4493b98 Implement more simd intrinsics 2021-07-24 15:25:32 +02:00
bjorn3
344cbac150 Fix simd_reduce_* intrinsics 2021-07-24 15:24:06 +02:00
bjorn3
a7b06e81fc Fix two type mismatch bugs 2021-07-23 18:29:47 +02:00
bjorn3
c42be7975f Support repr(simd) on ADTs containing a single array field
This is the cg_clif half of rust PR 78863
2021-07-23 18:28:33 +02:00
bjorn3
356360836e Avoid call to pointer_ty 2021-07-19 15:34:33 +02:00
bjorn3
0ebb4839f6 Rustup to rustc 1.55.0-nightly (59216858a 2021-07-18) 2021-07-19 15:32:22 +02:00
bjorn3
c151bb4ac5 Sync from rust 8df945c471 2021-07-19 15:23:20 +02:00
Yuki Okushi
d7c3c45d68 Rollup merge of #87092 - ricobbe:fix-raw-dylib-multiple-definitions, r=petrochenkov
Remove nondeterminism in multiple-definitions test

Compare all fields in `DllImport` when sorting to avoid nondeterminism in the error for multiple inconsistent definitions of an extern function.  Restore the multiple-definitions test.

Resolves #87084.
2021-07-18 14:21:56 +09:00
bjorn3
80b9e36709 Put all cg_clif specific options behind -Zunstable-features 2021-07-17 16:32:55 +02:00
bjorn3
60340d44d8 Don't panic when the target is not supported by Cranelift 2021-07-17 16:07:27 +02:00
bjorn3
6dc386e192 Don't truncate the shift amount
It isn't actually necessary
2021-07-17 14:34:58 +02:00
bjorn3
f7cfb9d6d5 Remove shl/shr special handling for 128bit ints
Cranelift now natively supports 128bit int shifting
2021-07-17 14:34:58 +02:00
Richard Cobbe
b47198aaa1 Consider all fields when comparing DllImports, to remove nondetermininsm in multiple-definitions test 2021-07-16 11:10:31 -07:00
Ralf Jung
e643b8b561 fix cranelift 2021-07-14 18:17:49 +02:00
Scott McMurray
e3091d74d8 Use cranelift's Type::int instead of doing the match myself
<https://docs.rs/cranelift-codegen/0.74.0/cranelift_codegen/ir/types/struct.Type.html#method.int>
2021-07-08 14:55:58 -07:00
Scott McMurray
7a0574d826 PR Feedback: Don't put SSA-only types in CValues 2021-07-08 14:55:58 -07:00
Scott McMurray
ea8d9aefda Implement the raw_eq intrinsic in codegen_cranelift 2021-07-08 14:55:57 -07:00
bjorn3
7167f4c9a4 Sync from rust 0deb536ff9 2021-07-08 18:03:33 +02:00
bjorn3
fb92375755 Merge commit '3a31c6d8272c14388a34622193baf553636fe470' into sync_cg_clif-2021-07-07 2021-07-07 11:14:20 +02:00
bjorn3
73d2e22969 Sync from rust b09dad3edd 2021-07-06 18:59:42 +02:00
bjorn3
4cfa1fcb5b Don't pass local_crate_name to link_binary separately
It is already part of CodegenResults
2021-07-06 17:49:23 +02:00
bjorn3
135edbf4ba Move LinkerInfo into CrateInfo 2021-07-06 15:31:38 +02:00
bjorn3
fed71e3448 Pass CrateInfo instead of TyCtxt to load_imported_symbols_for_jit 2021-07-05 18:46:13 +02:00
bjorn3
a0cdbd1aa6 Rustfmt 2021-07-05 18:44:37 +02:00
bjorn3
6b3a061e94 Remove LibSource
The information is stored in used_crate_source too anyway
2021-07-05 10:49:07 +02:00
bjorn3
83cca1b03c Write better clif ir header 2021-07-04 12:39:22 +02:00
Smitty
913c0bc01d Make vtable_allocation always succeed 2021-07-03 11:14:19 -04:00
bjorn3
751ae51044 Update Cranelift 2021-07-03 14:41:33 +02:00