Skip to content

CFI: Fix ICE: encode_const: unexpected type [usize#113708

Merged
bors merged 1 commit intorust-lang:masterfrom
rcvalle:rust-cfi-fix-100778
Jul 27, 2023
Merged

CFI: Fix ICE: encode_const: unexpected type [usize#113708
bors merged 1 commit intorust-lang:masterfrom
rcvalle:rust-cfi-fix-100778

Conversation

@rcvalle
Copy link
Copy Markdown
Member

@rcvalle rcvalle commented Jul 14, 2023

Fixes #100778 and #113366, and complements #106547 by adding support for encoding const parameters.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Jul 14, 2023

r? @WaffleLapkin

(rustbot has picked a reviewer for you, use r? to override)

@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 Jul 14, 2023
@rcvalle rcvalle added the PG-exploit-mitigations Project group: Exploit mitigations label Jul 14, 2023
@rcvalle
Copy link
Copy Markdown
Member Author

rcvalle commented Jul 14, 2023

r? @compiler-errors

compiler-errors
compiler-errors approved these changes Jul 16, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@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.

This needs rebase

@compiler-errors compiler-errors 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 16, 2023
@rcvalle rcvalle force-pushed the rust-cfi-fix-100778 branch from 1ab7a67 to dee5914 Compare July 17, 2023 17:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rcvalle
CFI: Fix ICE: encode_const: unexpected type [usize
55dea62 
Fixes rust-lang#100778 and rust-lang#113366, and complements rust-lang#106547 by adding support for
encoding const parameters.
@rcvalle rcvalle force-pushed the rust-cfi-fix-100778 branch from dee5914 to 55dea62 Compare July 17, 2023 21:26
@rcvalle
Copy link
Copy Markdown
Member Author

rcvalle commented Jul 17, 2023

This needs rebase

Done. Thank you for your time, @compiler-errors! Much appreciated.

@rcvalle rcvalle added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 21, 2023
@rcvalle rcvalle mentioned this pull request Jul 26, 2023
Open
6 tasks
@compiler-errors
Copy link
Copy Markdown
Contributor

compiler-errors commented Jul 26, 2023

@bors r+

@bors
Copy link
Copy Markdown
Collaborator

bors commented Jul 26, 2023

📌 Commit 55dea62 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 26, 2023
@bors
Copy link
Copy Markdown
Collaborator

bors commented Jul 26, 2023

⌛ Testing commit 55dea62 with merge a59ae33b2f7561faf938eb1c83037ee5a4fbaa8c...

@bors
Copy link
Copy Markdown
Collaborator

bors commented Jul 27, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 27, 2023
@bors
Copy link
Copy Markdown
Collaborator

bors commented Jul 27, 2023

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

@compiler-errors
Copy link
Copy Markdown
Contributor

compiler-errors commented Jul 27, 2023

:( bors

@bors retry

@bors
Copy link
Copy Markdown
Collaborator

bors commented Jul 27, 2023

⌛ Testing commit 55dea62 with merge d150dbb...

@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented Jul 27, 2023

Finished benchmarking commit (a59ae33b2f7561faf938eb1c83037ee5a4fbaa8c): 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.7% [2.7%, 2.7%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.3% [-3.4%, -3.2%] 2
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)		 3.9% [3.0%, 4.6%] 5
Regressions ❌
(secondary)		 3.9% [2.7%, 5.5%] 9
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 3.9% [3.0%, 4.6%] 5

Binary size

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

Bootstrap: 649.74s -> 650.357s (0.09%)

@bors
Copy link
Copy Markdown
Collaborator

bors commented Jul 27, 2023

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

@bors bors merged commit d150dbb into rust-lang:master Jul 27, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 27, 2023
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented Jul 27, 2023

Finished benchmarking commit (d150dbb): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

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)		 2.9% [2.9%, 2.9%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.9% [2.9%, 2.9%] 1

Cycles

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

Binary size

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

Bootstrap: 656.285s -> 653.837s (-0.37%)

@rcvalle rcvalle mentioned this pull request Aug 9, 2023
Closed
@maurer maurer mentioned this pull request Sep 12, 2023
Open
@rcvalle rcvalle deleted the rust-cfi-fix-100778 branch April 22, 2024 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

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

Reviewers whose approvals may not affect merge requirements

Assignees

@compiler-errors compiler-errors

Labels

merged-by-bors This PR was explicitly merged by bors. PG-exploit-mitigations Project group: Exploit mitigations 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.

ICE: encode_const: unexpected type [usize; 1] with -Clto -Zsanitizer=cfi

7 participants

@rcvalle @rustbot @rust-log-analyzer @compiler-errors @bors @rust-timer @WaffleLapkin