Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Use Rayon's TLV directly #108480

Merged
merged 2 commits into from
Mar 28, 2023
Merged

Use Rayon's TLV directly #108480

merged 2 commits into from
Mar 28, 2023

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Feb 26, 2023

This accesses Rayon's TLV thread local directly avoiding wrapper functions. This makes rustc work with rust-lang/rustc-rayon#10.

r? @cuviper

@rustbot 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 Feb 26, 2023
@rust-log-analyzer

This comment has been minimized.

# to view
@rustbot rustbot added the A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) label Mar 25, 2023
@Zoxc Zoxc marked this pull request as ready for review March 25, 2023 01:13
@rustbot
Copy link
Collaborator

rustbot commented Mar 25, 2023

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

@cuviper
Copy link
Member

cuviper commented Mar 25, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Mar 25, 2023

📌 Commit 27c44d2 has been approved by cuviper

It is now in the queue for this repository.

@bors 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 Mar 25, 2023
@bors
Copy link
Contributor

bors commented Mar 25, 2023

⌛ Testing commit 27c44d2 with merge 5ba595235388e21b81e32b29ef07912556f16f74...

@bors
Copy link
Contributor

bors commented Mar 25, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 25, 2023
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-mingw-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
[1298/3025] Building CXX object lib/DebugInfo/DWARF/CMakeFiles/LLVMDebugInfoDWARF.dir/DWARFDebugAbbrev.cpp.obj
[1299/3025] Linking CXX static library lib\libLLVMCore.a
[1300/3025] Building CXX object lib/DebugInfo/DWARF/CMakeFiles/LLVMDebugInfoDWARF.dir/DWARFDebugAddr.cpp.obj
[1301/3025] Linking CXX static library lib\libLLVMCFGuard.a
FAILED: lib/libLLVMCFGuard.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMCFGuard.a && C:\a\rust\rust\mingw64\bin\ar.exe qc lib\libLLVMCFGuard.a  lib/Transforms/CFGuard/CMakeFiles/LLVMCFGuard.dir/CFGuard.cpp.obj && C:\a\rust\rust\mingw64\bin\ranlib.exe lib\libLLVMCFGuard.a && cd ."
C:\a\rust\rust\mingw64\bin\ranlib.exe: could not create temporary file whilst writing archive: no more archived files
[1302/3025] Linking CXX static library lib\libLLVMBitReader.a
[1303/3025] Building CXX object lib/DebugInfo/DWARF/CMakeFiles/LLVMDebugInfoDWARF.dir/DWARFContext.cpp.obj
[1304/3025] Building CXX object lib/DebugInfo/DWARF/CMakeFiles/LLVMDebugInfoDWARF.dir/DWARFDebugArangeSet.cpp.obj
[1305/3025] Building AArch64GenGlobalISel.inc...
[1305/3025] Building AArch64GenGlobalISel.inc...
[1306/3025] Building CXX object lib/DebugInfo/DWARF/CMakeFiles/LLVMDebugInfoDWARF.dir/DWARFAcceleratorTable.cpp.obj
[1307/3025] Building CXX object lib/DebugInfo/DWARF/CMakeFiles/LLVMDebugInfoDWARF.dir/DWARFAbbreviationDeclaration.cpp.obj
[1308/3025] Building AArch64GenInstrInfo.inc...
ninja: build stopped: subcommand failed.
command did not execute successfully, got: exit code: 1


build script failed, must exit now', C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\cmake-0.1.48\src\lib.rs:975:5
 finished in 119.950 seconds
Build completed unsuccessfully in 0:04:12
Build completed unsuccessfully in 0:04:12
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@cuviper
Copy link
Member

cuviper commented Mar 27, 2023

@bors retry #108227

@bors 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 Mar 27, 2023
@Noratrieb Noratrieb mentioned this pull request Mar 28, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 28, 2023
@bors
Auto merge of rust-lang#109692 - Nilstrieb:rollup-hq65rps, r=Nilstrieb
478cbb4 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#91793 (socket ancillary data implementation for FreeBSD (from 13 and above).)
 - rust-lang#92284 (Change advance(_back)_by to return the remainder instead of the number of processed elements)
 - rust-lang#102472 (stop special-casing `'static` in evaluation)
 - rust-lang#108480 (Use Rayon's TLV directly)
 - rust-lang#109321 (Erase impl regions when checking for impossible to eagerly monomorphize items)
 - rust-lang#109470 (Correctly substitute GAT's type used in `normalize_param_env` in `check_type_bounds`)
 - rust-lang#109562 (Update ar_archive_writer to 0.1.3)
 - rust-lang#109629 (remove obsolete `givens` from regionck)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c31f752 into rust-lang:master Mar 28, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 28, 2023
@Zoxc Zoxc deleted the rayon-tlv branch March 29, 2023 02:08
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Apr 29, 2023
@Noratrieb
Rollup merge of rust-lang#108480 - Zoxc:rayon-tlv, r=cuviper
37ab4bd 
Use Rayon's TLV directly

This accesses Rayon's `TLV` thread local directly avoiding wrapper functions. This makes rustc work with rust-lang/rustc-rayon#10.

r? `@cuviper`
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Zoxc @rust-log-analyzer @rustbot @cuviper @bors