rustc_data_structures: Explicitly check for 64-bit atomics support by glaubitz · Pull Request #127075 · rust-lang/rust

glaubitz · 2024-06-28T06:13:08Z

Instead of keeping a list of architectures which have native support
for 64-bit atomics, just use #[cfg(target_has_atomic = "64")] and its
inverted counterpart to determine whether we need to use portable
AtomicU64 on the target architecture.

taiki-e · 2024-06-28T06:27:28Z

FWIW, I think we can use #[cfg(target_has_atomic = "64")]/#[cfg(not(target_has_atomic = "64"))] instead of listing concrete architecture names.

glaubitz · 2024-06-28T07:04:59Z

FWIW, I think we can use #[cfg(target_has_atomic = "64")]/#[cfg(not(target_has_atomic = "64"))] instead of listing concrete architecture names.

Good idea. Can we use this in the Cargo.toml as well?

taiki-e · 2024-06-28T07:15:38Z

Can we use this in the Cargo.toml as well?

Yes. (For example, cargo and pyo3 uses it in Cargo.toml.)

glaubitz · 2024-06-28T07:17:21Z

Can we use this in the Cargo.toml as well?

Yes. (For example, cargo and pyo3 uses it in Cargo.toml.)

OK, testing this now. Thanks a lot for the suggestion!

SparrowLii · 2024-06-28T07:36:17Z

Thanks! If #[cfg(target_has_atomic = "64")] works it's the best
r? @SparrowLii

SparrowLii · 2024-06-28T07:48:33Z

@bors delegate+
r=me after your testing

bors · 2024-06-28T07:48:36Z

✌️ @glaubitz, you can now approve this pull request!

If @SparrowLii told you to "r=me" after making some further change, please make that change, then do @bors r=@SparrowLii

Instead of keeping a list of architectures which have native support for 64-bit atomics, just use #[cfg(target_has_atomic = "64")] and its inverted counterpart to determine whether we need to use portable AtomicU64 on the target architecture.

glaubitz · 2024-06-28T08:53:39Z

@bors r=@SparrowLii

bors · 2024-06-28T08:53:41Z

📌 Commit ab1b48e has been approved by SparrowLii

It is now in the queue for this repository.

…rrowLii rustc_data_structures: Explicitly check for 64-bit atomics support Instead of keeping a list of architectures which have native support for 64-bit atomics, just use #[cfg(target_has_atomic = "64")] and its inverted counterpart to determine whether we need to use portable AtomicU64 on the target architecture.

…llaumeGomez Rollup of 10 pull requests Successful merges: - rust-lang#123714 (Add test for fn pointer duplication.) - rust-lang#124091 (Update AST validation module docs) - rust-lang#126963 (Add basic Serde serialization capabilities to Stable MIR) - rust-lang#127015 (Switch back `non_local_definitions` lint to allow-by-default) - rust-lang#127016 (docs: check if the disambiguator matches its suffix) - rust-lang#127029 (Fix Markdown tables in platform-support.md) - rust-lang#127032 (Enable const casting for `f16` and `f128`) - rust-lang#127041 (Migrate `run-make/override-aliased-flags` to `rmake.rs`) - rust-lang#127045 (Rename `super_predicates_of` and similar queries to `explicit_*` to note that they're not elaborated) - rust-lang#127075 (rustc_data_structures: Explicitly check for 64-bit atomics support) r? `@ghost` `@rustbot` modify labels: rollup

glaubitz · 2024-06-29T07:12:27Z

@SparrowLii This seems to be fallen out of the merge queue. Any ideas?

SparrowLii · 2024-06-29T08:22:10Z

@glaubitz Seems not related to this PR
https://github.com/rust-lang-ci/rust/actions/runs/9711788661/job/26805261710
or
plain

 thread 'main' panicked at src/lib.rs:1712:17:
  failed to copy `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe` to `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools-bin\miri.exe`: The process cannot access the file because it is being used by another process. (os error 32)
  note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
Build completed unsuccessfully in 0:00:09
  local time: Fri, Jun 28, 2024 12:32:23 PM
  network time: Fri, 28 Jun 2024 12:32:23 GMT
Error: Process completed with exit code 1.

Just wait for #127111 to merge

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#126822 (Bootstrap command refactoring: port more `Command` usages to `BootstrapCmd` (step 2)) - rust-lang#126835 (Simplifications in match lowering) - rust-lang#126953 (std: separate TLS key creation from TLS access) - rust-lang#127045 (Rename `super_predicates_of` and similar queries to `explicit_*` to note that they're not elaborated) - rust-lang#127075 (rustc_data_structures: Explicitly check for 64-bit atomics support) - rust-lang#127101 (remove redundant match statement from dataflow const prop) - rust-lang#127102 (Rename fuchsia builder and bump Fuchsia) - rust-lang#127103 (Move binder and polarity parsing into `parse_generic_ty_bound`) - rust-lang#127108 (unify `dylib` and `bin_helpers` and create `shared_helpers::parse_value_from_args`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#127075 - glaubitz:copy-and-paste-fix, r=SparrowLii rustc_data_structures: Explicitly check for 64-bit atomics support Instead of keeping a list of architectures which have native support for 64-bit atomics, just use #[cfg(target_has_atomic = "64")] and its inverted counterpart to determine whether we need to use portable AtomicU64 on the target architecture.

songdongsheng · 2024-07-04T16:20:05Z

compiler/rustc_data_structures/src/marker.rs

-        // MIPS, PowerPC and SPARC platforms with 32-bit pointers do not
-        // have AtomicU64 type.
-        #[cfg(not(any(target_arch = "powerpc", target_arch = "powerpc", target_arch = "sparc")))]
+        // Use portable AtomicU64 for targets without native 64-bit atomics


Wrong comment position, should be placed before line 156.

The comment applies to both the following statements, see the comment from the previous version.

rustbot assigned nagisa Jun 28, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 28, 2024

glaubitz mentioned this pull request Jun 28, 2024

Fixes for 32-bit SPARC on Linux #126907

Merged

rustbot assigned SparrowLii and unassigned nagisa Jun 28, 2024

glaubitz force-pushed the copy-and-paste-fix branch from 0167244 to ab1b48e Compare June 28, 2024 08:37

glaubitz changed the title ~~rustc_data_structures: Fix copy-and-paste error from previous change~~ rustc_data_structures: Explicitly check for 64-bit atomics support Jun 28, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 28, 2024

GuillaumeGomez mentioned this pull request Jun 28, 2024

Rollup of 10 pull requests #127079

Closed

matthiaskrgr mentioned this pull request Jun 29, 2024

Rollup of 9 pull requests #127111

Merged

bors merged commit 3369e83 into rust-lang:master Jun 29, 2024

rustbot added this to the 1.81.0 milestone Jun 29, 2024

songdongsheng reviewed Jul 4, 2024

View reviewed changes

Uh oh!

Conversation

glaubitz commented Jun 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

taiki-e commented Jun 28, 2024

Uh oh!

glaubitz commented Jun 28, 2024

Uh oh!

taiki-e commented Jun 28, 2024

Uh oh!

glaubitz commented Jun 28, 2024

Uh oh!

SparrowLii commented Jun 28, 2024

Uh oh!

SparrowLii commented Jun 28, 2024

Uh oh!

bors commented Jun 28, 2024

Uh oh!

glaubitz commented Jun 28, 2024

Uh oh!

bors commented Jun 28, 2024

Uh oh!

glaubitz commented Jun 29, 2024

Uh oh!

SparrowLii commented Jun 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

songdongsheng Jul 4, 2024

Choose a reason for hiding this comment

Uh oh!

glaubitz Jul 4, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

glaubitz commented Jun 28, 2024 •

edited

Loading

SparrowLii commented Jun 29, 2024 •

edited

Loading