Skip to content

Fix definition of Box in ssa-analysis-regression-50041.rs #94915

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 14, 2022
Merged

Fix definition of Box in ssa-analysis-regression-50041.rs #94915

merged 1 commit into from
Mar 14, 2022

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Mar 13, 2022

The Box in liballoc always has a field for the allocator. It is quite
hard to support both the old and new definition of Box in cg_clif so
this change uses the new definition in this test too.

@bjorn3 bjorn3 added the A-cranelift Things relevant to the [future] cranelift backend label Mar 13, 2022
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 13, 2022
@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 13, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bjorn3
Fix definition of Box in ssa-analysis-regression-50041.rs
a303273 
The Box in liballoc always has a field for the allocator. It is quite
hard to support both the old and new definition of Box in cg_clif so
this change uses the new definition in this test too.
@bjorn3 bjorn3 force-pushed the fix_test_box_def branch from 5891180 to a303273 Compare March 13, 2022 18:29
@tmiasko
Copy link
Contributor

tmiasko commented Mar 13, 2022

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 13, 2022

📌 Commit a303273 has been approved by tmiasko

@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 13, 2022
@bors
Copy link
Collaborator

bors commented Mar 14, 2022

⌛ Testing commit a303273 with merge ab0615543b70d236e827d4e62f11221d1b82b86c...

@bors
Copy link
Collaborator

bors commented Mar 14, 2022

💔 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 14, 2022
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
      Memory: 14 GB
      System Firmware Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMV7bBCJrzIB
      Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB

hw.ncpu: 3
hw.byteorder: 1234
---
Consolidate compiler generated dependencies of target RTSanitizerCommonCoverage.osx
[ 14%] Built target RTSanitizerCommonCoverage.osx
[ 71%] Built target RTSanitizerCommon.osx
Consolidate compiler generated dependencies of target RTSanitizerCommonSymbolizer.osx
lib/sanitizer_common/CMakeFiles/RTSanitizerCommonSymbolizer.osx.dir/compiler_depend.make:976: *** missing separator.  Stop.
Consolidate compiler generated dependencies of target RTInterception.osx
make[2]: *** [lib/sanitizer_common/CMakeFiles/RTSanitizerCommonSymbolizer.osx.dir/all] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [lib/lsan/CMakeFiles/clang_rt.lsan_osx_dynamic.dir/rule] Error 2
[ 71%] Built target RTInterception.osx
make: *** [clang_rt.lsan_osx_dynamic] Error 2
thread 'main' panicked at '
Build completed unsuccessfully in 0:50:22
command did not execute successfully, got: exit status: 2


build script failed, must exit now', /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/cmake-0.1.44/src/lib.rs:885:5

@bjorn3
Copy link
Member Author

bjorn3 commented Mar 14, 2022

@bors retry spurious clang build error

@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 14, 2022
@bors
Copy link
Collaborator

bors commented Mar 14, 2022

⌛ Testing commit a303273 with merge 0ac4658...

@bors
Copy link
Collaborator

bors commented Mar 14, 2022

☀️ Test successful - checks-actions
Approved by: tmiasko
Pushing 0ac4658 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 14, 2022
@bors bors merged commit 0ac4658 into rust-lang:master Mar 14, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 14, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0ac4658): comparison url.

Summary: This benchmark run did not return any relevant results. 7 results were found to be statistically significant but too small to be relevant.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@bjorn3 bjorn3 deleted the fix_test_box_def branch March 15, 2022 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-cranelift Things relevant to the [future] cranelift backend merged-by-bors This PR was explicitly merged by bors. 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.61.0
Development

Successfully merging this pull request may close these issues.
8 participants
@bjorn3 @rust-highfive @rust-log-analyzer @tmiasko @bors @rust-timer @Mark-Simulacrum @rustbot