Skip to content

Fix issue 57762 - #57840

Merged
bors merged 2 commits into
rust-lang:masterfrom
tromey:fix-issue-57762
Jan 24, 2019
Merged

Fix issue 57762#57840
bors merged 2 commits into
rust-lang:masterfrom
tromey:fix-issue-57762

Conversation

@tromey

@tromeytromey commented Jan 22, 2019

Copy link
Copy Markdown
Contributor

against a stock LLVM 7. LLVM 7 was released without a necessary fix
for a bug in the DWARF discriminant code.

This patch changes rustc to use the fallback mode on (non-Rust) LLVM 7.

Closes#57762

@rust-highfive

rust-highfive commented Jan 22, 2019

Copy link
Copy Markdown
Contributor

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 22, 2019
@tromey

tromey commented Jan 22, 2019

Copy link
Copy Markdown
ContributorAuthor

Someone the commit message was munged.

@tromey
Fix issue 57762
1c95f5a
Issue 57762 points out a compiler crash when the compiler was built
using a stock LLVM 7. LLVM 7 was released without a necessary fix for
a bug in the DWARF discriminant code.
This patch changes rustc to use the fallback mode on (non-Rust) LLVM 7.
Closesrust-lang#57762
@tromey

tromey commented Jan 22, 2019

Copy link
Copy Markdown
ContributorAuthor

*somehow. apparently I cannot type today. anyway, pushed a better message.

@cuvipercuviper added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jan 22, 2019
cuviper
cuviper reviewed Jan 22, 2019
View reviewed changes
Comment threadsrc/librustc_codegen_llvm/debuginfo/metadata.rs Outdated
nikic
nikic reviewed Jan 22, 2019
View reviewed changes
Comment threadsrc/librustc_codegen_llvm/debuginfo/metadata.rs Outdated
@tromey
Simplify the version check
9452a8d
Address the review comments by simplifying the version check to
just "< 8".
@nikic

nikic commented Jan 23, 2019

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jan 23, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 9452a8d has been approved by nikic

@borsbors 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 23, 2019
@Mark-SimulacrumMark-Simulacrum added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 23, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 23, 2019
@Centril
Rollup merge ofrust-lang#57840- tromey:fix-issue-57762, r=nikic
ab998a2
Fix issue 57762
against a stock LLVM 7. LLVM 7 was released without a necessary fix
for a bug in the DWARF discriminant code.
This patch changes rustc to use the fallback mode on (non-Rust) LLVM 7.
Closesrust-lang#57762
@CentrilCentril mentioned this pull request Jan 23, 2019
Merged
bors added a commit that referenced this pull request Jan 24, 2019
@bors
Auto merge of#57869- Centril:rollup, r=Centril
cd3d580
Rollup of 11 pull requests
Successful merges:
- #57179 (Update std/lib.rs docs to reflect Rust 2018 usage)
- #57730 (Merge visitors in AST validation)
- #57779 (Recover from parse errors in literal struct fields and incorrect float literals)
- #57793 (Explain type mismatch cause pointing to return type when it is `impl Trait`)
- #57795 (Use structured suggestion in stead of notes)
- #57817 (Add error for trailing angle brackets.)
- #57834 (Stabilize Any::get_type_id and rename to type_id)
- #57836 (Fix some cross crate existential type ICEs)
- #57840 (Fix issue 57762)
- #57844 (use port 80 for retrieving GPG key)
- #57858 (Ignore line ending on older git versions)
Failed merges:
r? @ghost
@bors

bors commented Jan 24, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 24, 2019
@bors
bors merged commit 9452a8d into rust-lang:masterJan 24, 2019
@pnkfelix

pnkfelix commented Jan 24, 2019

Copy link
Copy Markdown
Contributor

After T-compiler meeting, marking as beta-accepted.

@pnkfelixpnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 24, 2019
@pnkfelix

pnkfelix commented Jan 24, 2019

Copy link
Copy Markdown
Contributor

Discussed at T-compiler meeting. marking as stable-accepted. In particular, this PR on its own does not warrant a point release, but it is worth including in a hypothetical point release, should one happen.

@pnkfelixpnkfelix added the stable-accepted Accepted for backporting to the compiler in the stable channel. label Jan 24, 2019
@tromey
tromey deleted the fix-issue-57762 branch January 24, 2019 15:35
@emilyalbiniemilyalbini mentioned this pull request Jan 24, 2019
Merged
@emilyalbiniemilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 24, 2019
bors added a commit that referenced this pull request Jan 24, 2019
@bors
Auto merge of#57878- pietroalbini:beta-backports, r=pietroalbini
635817b
[beta] Rollup backports
* #57857: Fix Android CI failing to download SDKs
* #57840: Fix issue 57762
* #57698: Fix typo bug in DepGraph::try_mark_green().
r? @ghost
@emilyalbiniemilyalbini removed stable-accepted Accepted for backporting to the compiler in the stable channel. labels Feb 20, 2019
@Mark-SimulacrumMark-Simulacrum removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Feb 27, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cuvipercuvipercuviper left review comments
@nikicnikicnikic left review comments

Assignees

@eddybeddyb

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

rustc 1.32 using system LLVM crashes while building the resvg crate

9 participants

@tromey@rust-highfive@nikic@bors@pnkfelix@cuviper@eddyb@emilyalbini@Mark-Simulacrum