Skip to content
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

make typeid::typeid_itanium_cxx_abi::transform_ty evaluate length in array types #114672

Merged
merged 1 commit into from
Aug 11, 2023
Merged

make typeid::typeid_itanium_cxx_abi::transform_ty evaluate length in array types #114672

merged 1 commit into from
Aug 11, 2023

Conversation

lenawanel
Copy link
Contributor

@lenawanel lenawanel commented Aug 9, 2023 •
edited
Loading

the ICE in #114275 was caused by transform_ty
in compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs encountering an unevaluated const, while expecting it to already be evaluated.

@rustbot
Copy link
Collaborator

rustbot commented Aug 9, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @fee1-dead (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@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 Aug 9, 2023
@compiler-errors
Copy link
Member

This PR could really use a better title, one that describes what it does. The "fixes ###" part can go in the PR description.

@lenawanel lenawanel changed the title fix #114275 make typeid/typeid_itanium_cxx_abi.rs evaluate length in array types Aug 9, 2023
@lenawanel lenawanel changed the title make typeid/typeid_itanium_cxx_abi.rs evaluate length in array types make typeid::typeid_itanium_cxx_abi::transform_ty evaluate length in array types Aug 9, 2023
@lenawanel
Copy link
Contributor Author

is this title better?

@compiler-errors
Copy link
Member

Yes. Also, this needs a test too

Please put it with the other CFI tests, probably in tests/ui/sanitize (but you should just grep for -Zsanitizer=cfi in the test suite).

compiler-errors
compiler-errors approved these changes Aug 9, 2023
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please fix typo and squash this into one commit, then i can approve

tests/ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs Outdated Show resolved Hide resolved
@compiler-errors
Copy link
Member

r? @compiler-errors @bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 9, 2023

📌 Commit bd5dfbcbdca72ac158f558c95c1502414edf89a8 has been approved by compiler-errors

It is now in the queue for this repository.

@rustbot rustbot assigned compiler-errors and unassigned fee1-dead Aug 9, 2023
@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 Aug 9, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 9, 2023
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 9, 2023

📌 Commit 6394d88 has been approved by compiler-errors

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 9, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 10, 2023
@matthiaskrgr
Rollup merge of rust-lang#114672 - lenawanel:master, r=compiler-errors
94d47f9 
make `typeid::typeid_itanium_cxx_abi::transform_ty` evaluate length in array types

the ICE in rust-lang#114275 was caused by `transform_ty`
in compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs encountering an unevaluated const, while expecting it to already be evaluated.
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 10, 2023
Closed
@matthiaskrgr
Copy link
Member

@bors r-
failed in a rollup #114686 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 10, 2023
@lenawanel
fix rust-lang#114275
7834ffb 
this ICE was caused by `transform_ty`
in compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs
encountering an unevaluated const, while expecting it to already be evaluated.

add a regression test

Update tests/ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs

Co-authored-by: Michael Goulet <michael@errs.io>

Update tests/ui/sanitize/issue-114275-cfi-const-expr-in-arry-len.rs

Co-authored-by: Michael Goulet <michael@errs.io>

fix test compiling for targets with -crt-static and failing

this was causign rust-lang#114686 to fail
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 11, 2023

📌 Commit 7834ffb has been approved by compiler-errors

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 11, 2023
@bors
Copy link
Contributor

bors commented Aug 11, 2023

⌛ Testing commit 7834ffb with merge 4d7a80d...

@bors
Copy link
Contributor

bors commented Aug 11, 2023

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 4d7a80d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 11, 2023
@bors bors merged commit 4d7a80d into rust-lang:master Aug 11, 2023
12 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Aug 11, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4d7a80d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.0% [2.0%, 2.0%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 632.612s -> 632.73s (0.02%)

@rcvalle rcvalle mentioned this pull request Apr 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

Labels
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.73.0
Development

Successfully merging this pull request may close these issues.
8 participants
@lenawanel @rustbot @compiler-errors @bors @rust-log-analyzer @matthiaskrgr @rust-timer @fee1-dead