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

#[optimize(none)] implies #[inline(never)] #136358

Merged
merged 1 commit into from
Feb 2, 2025
Merged

#[optimize(none)] implies #[inline(never)] #136358

merged 1 commit into from
Feb 2, 2025
+26 −1

Conversation

clubby789
Copy link
Contributor

Fixes #136329

@rustbot
Copy link
Collaborator

rustbot commented Jan 31, 2025

r? @matthewjasper

rustbot has assigned @matthewjasper.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Jan 31, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 31, 2025

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@saethlin
Copy link
Member

r? saethlin
@bors r+

@bors
Copy link
Contributor

bors commented Jan 31, 2025

📌 Commit 2c35bd0 has been approved by saethlin

It is now in the queue for this repository.

@rustbot rustbot assigned saethlin and unassigned matthewjasper Jan 31, 2025
@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 Jan 31, 2025
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jan 31, 2025
@workingjubilee
Rollup merge of rust-lang#136358 - clubby789:opt-none-noinline, r=sae…
26a42c1 
…thlin

`#[optimize(none)]` implies `#[inline(never)]`

Fixes rust-lang#136329
@workingjubilee workingjubilee mentioned this pull request Jan 31, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2025
@bors
Auto merge of rust-lang#136367 - workingjubilee:rollup-pud5uj0, r=wor…
1bc23f1 
…kingjubilee

Rollup of 16 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#135768 (tests: Port `symbol-mangling-hashed` to rmake.rs)
 - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL)
 - rust-lang#135840 (omit unused args warnings for intrinsics without body)
 - rust-lang#135900 (Manually walk into WF obligations in `BestObligation` proof tree visitor)
 - rust-lang#136146 (Explicitly choose x86 softfloat/hardfloat ABI)
 - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe})
 - rust-lang#136163 (Fix off-by-one error causing slice::sort to abort the program)
 - rust-lang#136266 (fix broken release notes id)
 - rust-lang#136283 (Update encode_utf16 to mention it is native endian)
 - rust-lang#136309 (set rustc dylib on manually constructed rustc command)
 - rust-lang#136314 (Use proper type when applying deref adjustment in const)
 - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets)
 - rust-lang#136348 (miri: make float min/max non-deterministic)
 - rust-lang#136351 (Add documentation for derive(CoercePointee))
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)

Failed merges:

 - rust-lang#135994 (Rename rustc_middle::Ty::is_unsafe_ptr to is_raw_ptr)

r? `@ghost`
`@rustbot` modify labels: rollup
jhpratt added a commit to jhpratt/rust that referenced this pull request Feb 1, 2025
@jhpratt
Rollup merge of rust-lang#136358 - clubby789:opt-none-noinline, r=sae…
dd685de 
…thlin

`#[optimize(none)]` implies `#[inline(never)]`

Fixes rust-lang#136329
@jhpratt jhpratt mentioned this pull request Feb 1, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2025
@bors
Auto merge of rust-lang#136378 - jhpratt:rollup-l4w55bm, r=jhpratt
7a05a60 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#134740 (Add amdgpu target)
 - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL)
 - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe})
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136283 (Update encode_utf16 to mention it is native endian)
 - rust-lang#136309 (set rustc dylib on manually constructed rustc command)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)
 - rust-lang#136368 (Make comma separated lists of anything easier to make for errors)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2025
@bors
Auto merge of rust-lang#136378 - jhpratt:rollup-l4w55bm, r=jhpratt
c9d75bf 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#134740 (Add amdgpu target)
 - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL)
 - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe})
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136283 (Update encode_utf16 to mention it is native endian)
 - rust-lang#136309 (set rustc dylib on manually constructed rustc command)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)
 - rust-lang#136368 (Make comma separated lists of anything easier to make for errors)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 1, 2025
@matthiaskrgr
Rollup merge of rust-lang#136358 - clubby789:opt-none-noinline, r=sae…
6bbbc75 
…thlin

`#[optimize(none)]` implies `#[inline(never)]`

Fixes rust-lang#136329
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 1, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2025
@bors
Auto merge of rust-lang#136380 - matthiaskrgr:rollup-wcchra1, r=<try>
845d335 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#134740 (Add amdgpu target)
 - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL)
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136283 (Update encode_utf16 to mention it is native endian)
 - rust-lang#136309 (set rustc dylib on manually constructed rustc command)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)
 - rust-lang#136368 (Make comma separated lists of anything easier to make for errors)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: dist-powerpc64-linux
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 1, 2025
@matthiaskrgr
Rollup merge of rust-lang#136358 - clubby789:opt-none-noinline, r=sae…
253985c 
…thlin

`#[optimize(none)]` implies `#[inline(never)]`

Fixes rust-lang#136329
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 1, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2025
@bors
Auto merge of rust-lang#136386 - matthiaskrgr:rollup-afmv0x3, r=<try>
5b9a105 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL)
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: dist-powerpc64-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2025
@bors
Auto merge of rust-lang#136378 - jhpratt:rollup-l4w55bm, r=<try>
f11feda 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#134740 (Add amdgpu target)
 - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL)
 - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe})
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136283 (Update encode_utf16 to mention it is native endian)
 - rust-lang#136309 (set rustc dylib on manually constructed rustc command)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)
 - rust-lang#136368 (Make comma separated lists of anything easier to make for errors)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: dist-powerpc64-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2025
@bors
Auto merge of rust-lang#136378 - jhpratt:rollup-l4w55bm, r=matthiaskrgr
2d873b1 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#134740 (Add amdgpu target)
 - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL)
 - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe})
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136283 (Update encode_utf16 to mention it is native endian)
 - rust-lang#136309 (set rustc dylib on manually constructed rustc command)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)
 - rust-lang#136368 (Make comma separated lists of anything easier to make for errors)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: dist-powerpc64-linux
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 1, 2025
@matthiaskrgr
Rollup merge of rust-lang#136358 - clubby789:opt-none-noinline, r=sae…
87dad0f 
…thlin

`#[optimize(none)]` implies `#[inline(never)]`

Fixes rust-lang#136329
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 1, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
@bors
Auto merge of rust-lang#136399 - matthiaskrgr:rollup-9l7fwnv, r=matth…
bcae61a 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#134740 (Add amdgpu target)
 - rust-lang#136133 (Fix sentence in process::abort)
 - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe})
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)
 - rust-lang#136368 (Make comma separated lists of anything easier to make for errors)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
@bors
Auto merge of rust-lang#136399 - matthiaskrgr:rollup-9l7fwnv, r=matth…
9f6870c 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#134740 (Add amdgpu target)
 - rust-lang#136133 (Fix sentence in process::abort)
 - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe})
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)
 - rust-lang#136368 (Make comma separated lists of anything easier to make for errors)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
@bors
Auto merge of rust-lang#136399 - matthiaskrgr:rollup-9l7fwnv, r=matth…
dddd876 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#134740 (Add amdgpu target)
 - rust-lang#136133 (Fix sentence in process::abort)
 - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe})
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)
 - rust-lang#136368 (Make comma separated lists of anything easier to make for errors)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 2, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
@bors
Auto merge of rust-lang#136433 - matthiaskrgr:rollup-co27itw, r=matth…
e1f0920 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu)
 - rust-lang#136133 (Fix sentence in process::abort)
 - rust-lang#136279 (Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the associated docs)
 - rust-lang#136328 (Rework "long type names" printing logic)
 - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`)
 - rust-lang#136368 (Make comma separated lists of anything easier to make for errors)
 - rust-lang#136412 (Tweak fn pointer suggestion span)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ce5db2f into rust-lang:master Feb 2, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 2, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
@rust-timer
Unrolled build for rust-lang#136358
7e2a641 
Rollup merge of rust-lang#136358 - clubby789:opt-none-noinline, r=saethlin

`#[optimize(none)]` implies `#[inline(never)]`

Fixes rust-lang#136329
@briansmith
Copy link
Contributor

Shouldn't this change have been made to whatever calls try_inlining instead of to the implementation of inlining? It seems like MIR is still optimizing #[optimize(none)] functions and we've only reduced the number of optimizations by one, when instead we should be skipping most or all MIR optimizations.

@briansmith briansmith mentioned this pull request Feb 6, 2025
Closed
@clubby789
Copy link
Contributor Author

The problem is that before applying an optimization, we check the body we're optimizing to see if optimization is disabled. However, in this case

fn foo() { bar(); }

#[optimize(none)]
fn bar() {}

We're applying the inlining optimization to foo, which is valid. As this is an interprocedural opt, we need to check the callee to check if it shouldn't be inlined (this is also how #[inline(never)] is handled just above

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saethlin saethlin saethlin left review comments

Assignees

@saethlin saethlin

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

Successfully merging this pull request may close these issues.

#[optimize(none)] should imply #[inline(never)]
6 participants
@clubby789 @rustbot @saethlin @bors @briansmith @matthewjasper