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.

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

Inline CStr::from_bytes_with_nul_unchecked::rt_impl #100371

Conversation

KamilaBorowska
Copy link
Contributor

@KamilaBorowska KamilaBorowska commented Aug 10, 2022

Currently CStr::from_bytes_with_nul_unchecked::rt_impl is not being inlined. The following function:

pub unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) {
    CStr::from_bytes_with_nul_unchecked(bytes);
}

Outputs the following assembly on current nightly

example::from_bytes_with_nul_unchecked:
        jmp     qword ptr [rip + _ZN4core3ffi5c_str4CStr29from_bytes_with_nul_unchecked7rt_impl17h026f29f3d6a41333E@GOTPCREL]

Meanwhile on beta this provides the following assembly:

example::from_bytes_with_nul_unchecked:
        ret

This pull request adds #[inline] annotation tort_impl to fix a code generation regression for CStr::from_bytes_with_nul_unchecked.

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Aug 10, 2022
@rustbot
Copy link
Collaborator

rustbot commented Aug 10, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive
Copy link
Collaborator

r? @scottmcm

(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 Aug 10, 2022
@scottmcm
Copy link
Member

This is a concrete type (not a generic one), so adding #[inline] for a trivial method like this is perfectly reasonable.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 10, 2022

📌 Commit de95117 has been approved by scottmcm

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 Aug 10, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 10, 2022
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#100286 (Add support for link-flavor rust-lld for macOS)
 - rust-lang#100317 (Remove logic related to deprecated nvptx-nvidia-cuda (32-bit) target)
 - rust-lang#100339 (Fixes bootstrap panic when running x fmt --check )
 - rust-lang#100348 (Add regression test for rust-lang#93205)
 - rust-lang#100349 (Refactor: remove a type string comparison)
 - rust-lang#100353 (Fix doc links in core::time::Duration::as_secs)
 - rust-lang#100359 (Special-case references to leafs in valtree pretty-printing)
 - rust-lang#100371 (Inline CStr::from_bytes_with_nul_unchecked::rt_impl)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit eff71b9 into rust-lang:master Aug 10, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants