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

Revert "Disable the machine outliner by default" #88388

Merged
merged 1 commit into from
Aug 28, 2021
Merged

Conversation

ldm0
Copy link
Contributor

@ldm0 ldm0 commented Aug 27, 2021

@rust-highfive
Copy link
Collaborator

r? @wesleywiser

(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 27, 2021
// bound.
if llvm_util::get_version() >= (11, 0, 0) {
add("-enable-machine-outliner=never", false);
}
Copy link
Member

Choose a reason for hiding this comment

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

What is the policy on this? Should the disable only be reverted for the rust fork of LLVM or LLVM 13 and up?

Copy link
Member

Choose a reason for hiding this comment

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

I'd say disable for >= 11.0.0 && < 12.0.1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Our fork of 12.0.1 doesn't contain the fix commit. https://github.com/rust-lang/llvm-project/tree/rustc/12.0-2021-07-10 So I changed the disabling range to >= 11.0.0 && < 13.0.0

@nikic
Copy link
Contributor

nikic commented Aug 28, 2021

@bors r+ rollup=never (in case there are more issues)

@bors
Copy link
Contributor

bors commented Aug 28, 2021

📌 Commit bf2f665 has been approved by nikic

@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 28, 2021
@bors
Copy link
Contributor

bors commented Aug 28, 2021

⌛ Testing commit bf2f665 with merge 84b0183...

@bors
Copy link
Contributor

bors commented Aug 28, 2021

☀️ Test successful - checks-actions
Approved by: nikic
Pushing 84b0183 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 28, 2021
@bors bors merged commit 84b0183 into rust-lang:master Aug 28, 2021
@ldm0 ldm0 deleted the outliner branch October 27, 2021 04:10
@cuviper cuviper added this to the 1.56.0 milestone Nov 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants