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

Consistently use LLVM lifetime markers during codegen #72178

Merged
merged 1 commit into from
May 17, 2020

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented May 13, 2020

Ensure that inliner inserts lifetime markers if they have been emitted during
codegen. Otherwise if allocas from inlined functions are merged together,
lifetime markers from one function might invalidate load & stores performed
by the other one.

Fixes #72154.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 13, 2020
@nikic
Copy link
Contributor

nikic commented May 14, 2020

This looks fine to me, but I'm wondering if there would be value in adding the testcase from #72154 as an asan test?

@tmiasko
Copy link
Contributor Author

tmiasko commented May 14, 2020

I added a regression test and made equivalent changes to the flow using a new LLVM pass manager (although, as far as I can see it is not affected by the original issue, since inliner used there does not merge allocas).

Ensure that inliner inserts lifetime markers if they have been emitted during
codegen. Otherwise if allocas from inlined functions are merged together,
lifetime markers from one function might invalidate load & stores performed
by the other one.
@nikic
Copy link
Contributor

nikic commented May 14, 2020

@bors r+

@bors
Copy link
Contributor

bors commented May 14, 2020

📌 Commit bbb63d4 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 May 14, 2020
@bors
Copy link
Contributor

bors commented May 16, 2020

⌛ Testing commit bbb63d4 with merge 0ec4b06...

@bors
Copy link
Contributor

bors commented May 17, 2020

☀️ Test successful - checks-azure
Approved by: nikic
Pushing 0ec4b06 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2020
@bors bors merged commit 0ec4b06 into rust-lang:master May 17, 2020
@tmiasko tmiasko deleted the inliner-lifetimes branch May 17, 2020 09:14
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.

ManuallyDrop constructed with properly initialized data via MaybeUninit fails ASan
5 participants