always try inlining functions which do not call other functions #75495

lcnr · 2020-08-13T19:53:30Z

This is still a bit broken.

r? @wesleywiser

lcnr · 2020-08-13T19:57:49Z

@bors try @rust-timer queue

rust-timer · 2020-08-13T19:57:50Z

Awaiting bors try build completion

bors · 2020-08-13T19:58:00Z

⌛ Trying commit bea062f with merge ad4a8ac0048cc0c83e82f277bfd16984c79b1c44...

tmiasko · 2020-08-13T20:31:51Z

FYI: If the intention is to enable this on mir-opt-level=1, it might be necessary to resolve #71793 first.

rust-log-analyzer · 2020-08-13T20:35:58Z

The job dist-x86_64-linux of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

   Compiling ra_ide_db v0.1.0 (/checkout/src/tools/rust-analyzer/crates/ra_ide_db)
   Compiling ra_ssr v0.1.0 (/checkout/src/tools/rust-analyzer/crates/ra_ssr)
   Compiling ra_assists v0.1.0 (/checkout/src/tools/rust-analyzer/crates/ra_assists)
   Compiling ra_ide v0.1.0 (/checkout/src/tools/rust-analyzer/crates/ra_ide)
error: internal compiler error: src/librustc_trait_selection/traits/codegen/mod.rs:75:17: Encountered error `OutputTypeParameterMismatch(Binder(<[closure@crates/ra_ide/src/expand_macro.rs:86:27: 88:10 token_iter:&mut std::iter::Peekable<std::iter::FilterMap<std::iter::Map<std::iter::Successors<ra_syntax::WalkEvent<ra_syntax::NodeOrToken<rowan::cursor::SyntaxNode, rowan::cursor::SyntaxToken>>, [closure@rowan::cursor::SyntaxNode::preorder_with_tokens::{{closure}}#0 0:ra_syntax::NodeOrToken<rowan::cursor::SyntaxNode, rowan::cursor::SyntaxToken>]>, [closure@rowan::api::SyntaxNode::<L>::preorder_with_tokens::{{closure}}#0]>, [closure@crates/ra_ide/src/expand_macro.rs:73:21: 79:10]>>] as std::ops::FnMut<(fn(ra_syntax::SyntaxKind) -> bool, bool)>>), Binder(<[closure@crates/ra_ide/src/expand_macro.rs:86:27: 88:10 token_iter:&mut std::iter::Peekable<std::iter::FilterMap<impl std::iter::Iterator, [closure@crates/ra_ide/src/expand_macro.rs:73:21: 79:10]>>] as std::ops::FnMut<(fn(ra_syntax::SyntaxKind) -> bool, bool)>>), Sorts(ExpectedFound { expected: impl std::iter::Iterator, found: std::iter::Map<std::iter::Successors<ra_syntax::WalkEvent<ra_syntax::NodeOrToken<rowan::cursor::SyntaxNode, rowan::cursor::SyntaxToken>>, [closure@rowan::cursor::SyntaxNode::preorder_with_tokens::{{closure}}#0 0:ra_syntax::NodeOrToken<rowan::cursor::SyntaxNode, rowan::cursor::SyntaxToken>]>, [closure@rowan::api::SyntaxNode::<L>::preorder_with_tokens::{{closure}}#0]> }))` selecting `Binder(<[closure@crates/ra_ide/src/expand_macro.rs:86:27: 88:10 token_iter:&mut std::iter::Peekable<std::iter::FilterMap<impl std::iter::Iterator, [closure@crates/ra_ide/src/expand_macro.rs:73:21: 79:10]>>] as std::ops::FnMut<(fn(ra_syntax::SyntaxKind) -> bool, bool)>>)` during codegen
thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:915:9
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

note: the compiler unexpectedly panicked. this is a bug.
note: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md

note: rustc 1.47.0-nightly (ad4a8ac00 2020-08-13) running on x86_64-unknown-linux-gnu
note: compiler flags: -Z macro-backtrace -Z binary-dep-depinfo -C opt-level=3 -C embed-bitcode=no -C debuginfo=0 -C linker=clang -C link-args=-Wl,-rpath,$ORIGIN/../lib --crate-type lib

note: some of the compiler flags provided by cargo are hidden


error: aborting due to previous error

error: could not compile `ra_ide`.
To learn more, run the command again with --verbose.
warning: build failed, waiting for other jobs to finish...
error: build failed
command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml" "--message-format" "json-render-diagnostics"
command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml" "--message-format" "json-render-diagnostics"
expected success, got: exit code: 101
thread 'main' panicked at 'rust-analyzer always builds', src/bootstrap/dist.rs:1402:14
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
Build completed unsuccessfully in 0:33:39
== clock drift check ==
  local time: Thu Aug 13 20:35:50 UTC 2020
  local time: Thu Aug 13 20:35:50 UTC 2020
  network time: Thu, 13 Aug 2020 20:35:50 GMT
== end clock drift check ==
##[error]Process completed with exit code 1.
Terminate orphan process: pid (2744) (python)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

bors · 2020-08-13T20:36:11Z

💔 Test failed - checks-actions

lcnr · 2020-08-13T20:39:57Z

looks like ra also breaks because of #68347

cuviper · 2020-08-13T20:40:02Z

library/core/src/iter/range.rs

-            }
-            // Do wrapping math to allow e.g. `Step::forward(-128i8, 255)`.
-            start.wrapping_add(n as Self)
+            start + (n as Self)


I think the intention here was to inherit the user's setting for debug assertion, even when std is compiled in release mode (as it usually is).

yeah, will have to rewrite this again before merging 👍

leonardo-m · 2020-08-13T21:29:03Z

I think "functions which do not call other function" used to be called leaf functions.

bors · 2020-08-15T05:30:32Z

☔ The latest upstream changes (presumably #75549) made this pull request unmergeable. Please resolve the merge conflicts.

lcnr · 2020-09-01T08:23:28Z

closing this for now as there are still some bugs with inlining we have to fix first

lcnr · 2020-09-28T19:16:10Z

rebased on top of #77306 meaning that all inlining ICE I know of are fixed,

let's see if we can get a perf run going here

lcnr · 2020-09-28T19:23:40Z

@bors try @rust-timer queue

looks like all test failures are expected

rust-timer · 2020-09-28T19:23:42Z

Awaiting bors try build completion

lcnr · 2020-09-28T19:24:39Z

I first rebased and then tried to open

let's open another PR

lcnr · 2020-09-28T19:27:50Z

@Mark-Simulacrum should I do something to cancel rust-timer here?

Mark-Simulacrum · 2020-09-28T19:28:51Z

Don't worry about it -- it'll just stick around but that's not a problem.

slightly broken inlining

bea062f

rust-highfive assigned wesleywiser Aug 13, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 13, 2020

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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2020

cuviper reviewed Aug 13, 2020

View reviewed changes

lcnr closed this Sep 1, 2020

tmiasko mentioned this pull request Sep 19, 2020

[mir-opt] Introduce a new flag to enable experimental/unsound mir opts #76899

Merged

lcnr mentioned this pull request Sep 28, 2020

always try inlining functions which do not call other functions #77307

Closed

always try inlining functions which do not call other functions #75495

always try inlining functions which do not call other functions #75495

Uh oh!

Conversation

lcnr commented Aug 13, 2020

Uh oh!

lcnr commented Aug 13, 2020

Uh oh!

rust-timer commented Aug 13, 2020

Uh oh!

bors commented Aug 13, 2020

Uh oh!

tmiasko commented Aug 13, 2020

Uh oh!

rust-log-analyzer commented Aug 13, 2020

Uh oh!

bors commented Aug 13, 2020

Uh oh!

lcnr commented Aug 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cuviper Aug 13, 2020

Choose a reason for hiding this comment

Uh oh!

lcnr Aug 13, 2020

Choose a reason for hiding this comment

Uh oh!

leonardo-m commented Aug 13, 2020

Uh oh!

bors commented Aug 15, 2020

Uh oh!

lcnr commented Sep 1, 2020

Uh oh!

lcnr commented Sep 28, 2020

Uh oh!

lcnr commented Sep 28, 2020

Uh oh!

rust-timer commented Sep 28, 2020

Uh oh!

lcnr commented Sep 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lcnr commented Sep 28, 2020

Uh oh!

Mark-Simulacrum commented Sep 28, 2020

Uh oh!

Uh oh!

lcnr commented Aug 13, 2020 •

edited

Loading

lcnr commented Sep 28, 2020 •

edited

Loading