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

llvm: backport "[SimplifyCFG] Hoisting invalidates metadata". #36117

Merged
merged 1 commit into from
Aug 30, 2016

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Aug 29, 2016

Fixes #36023 by backporting @majnemer's LLVM patch fixing the LLVM bug where SimplifyCFG hoisted instructions andkept their metadata (conditional !nonnull loads could kill a null check later if hoisted).

r? @alexcrichton

@alexcrichton
Copy link
Member

alexcrichton commented Aug 29, 2016

@bors: r+ 61a639e p=1

Raising priority a bit as it fixes a regression and we'll likely want to backport if this lands. Thanks for the investigation @eddyb!

@bors
Copy link
Contributor

bors commented Aug 29, 2016

💡 This pull request was already approved, no need to approve it again.

@alexcrichton alexcrichton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 29, 2016
@bors
Copy link
Contributor

bors commented Aug 30, 2016

⌛ Testing commit 61a639e with merge addb753...

bors added a commit that referenced this pull request Aug 30, 2016
llvm: backport "[SimplifyCFG] Hoisting invalidates metadata".

Fixes #36023 by backporting @majnemer's LLVM patch fixing [the LLVM bug](https://llvm.org/bugs/show_bug.cgi?id=29163.) where SimplifyCFG hoisted instructions andkept their metadata (conditional `!nonnull` loads could kill a null check later if hoisted).

r? @alexcrichton
@bors bors merged commit 61a639e into rust-lang:master Aug 30, 2016
@eddyb eddyb deleted the llvm-hoist-meta branch August 30, 2016 04:35
@TimNN TimNN mentioned this pull request Aug 30, 2016
@@ -0,0 +1,32 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
Copy link
Member

Choose a reason for hiding this comment

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

This test fails on Travis CI. Any ideas why?

Copy link
Member Author

Choose a reason for hiding this comment

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

Travis doesn't use the patched LLVM, so the test can't pass on it. See #36138.

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 1, 2016
@nikomatsakis
Copy link
Contributor

Accepting for backport.

@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustup-init 0.6.1 segfaults on x86_64 and armv7, 0.6.0 on OS X 10.10
6 participants