Skip to content

[stable] Backport fix for #60989 "ICE with incorrect turbofish" - #61085

Closed
oli-obk wants to merge 3 commits into
rust-lang:stablefrom
oli-obk:stable_ice
Closed

[stable] Backport fix for #60989 "ICE with incorrect turbofish"#61085
oli-obk wants to merge 3 commits into
rust-lang:stablefrom
oli-obk:stable_ice

Conversation

@oli-obk

@oli-obkoli-obk commented May 23, 2019

Copy link
Copy Markdown
Contributor

stable fix backport for #60989

do not merge yet, untested

@rust-highfive

rust-highfive commented May 23, 2019

Copy link
Copy Markdown
Contributor

r? @petrochenkov

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

@rust-highfive

rust-highfive commented May 23, 2019

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

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

petrochenkov commented May 23, 2019

Copy link
Copy Markdown
Contributor

r? @pietroalbini

@eddyb

eddyb commented May 23, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

Started stage1 test build to help out, apparently LLVM builds make it hard to test stable backports.

EDIT: most of it took like 7 seconds, with all the TableGen stuff maybe about a minute.
I guess I had an old enough LLVM build in ccache, this machine is not that fast.

@alexcrichtonalexcrichton changed the title Fix backport to stable[stable] Fix backport to stableMay 23, 2019
eddyb
eddyb reviewed May 23, 2019
View reviewed changes
Comment threadsrc/test/run-pass/issue-60989.rs Outdated
@eddyb

eddyb commented May 23, 2019

Copy link
Copy Markdown
Contributor
error: internal compiler error: src/librustc/hir/def.rs:271: attempted .def_id() on invalid def: Local(NodeId(13246))

I talked to @oli-obk, and he doesn't mind me taking over (since I already have a build dir for this).

@emilyalbini

emilyalbini commented May 23, 2019

Copy link
Copy Markdown
Member

This is ok from a release point of view, but I'm not knowledgeable enough to be the assignee for this.

Centril
Centril reviewed May 23, 2019
View reviewed changes
Comment threadsrc/test/compile-fail/issue-60989.rs Outdated
@eddybeddyb changed the title [stable] Fix backport to stable[stable] Backport fix for #60989 "ICE with incorrect turbofish"May 23, 2019
Centril
Centril reviewed May 23, 2019
View reviewed changes
Comment threadsrc/test/compile-fail/issue-60989.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
@eddyb

eddyb commented May 23, 2019

Copy link
Copy Markdown
Contributor

./x.py test --stage 1 src/test/ui succeeds now for me, what's left?
Presumably someone other than me has to review it (@varkor?).

@emilyalbini

emilyalbini commented May 23, 2019

Copy link
Copy Markdown
Member

Anyone from @rust-lang/compiler up for a review of this?

@varkor

varkor commented May 23, 2019

Copy link
Copy Markdown
Contributor

@bors r+ p=1000

@bors

bors commented May 23, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 6e81f82 has been approved by varkor

@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 May 23, 2019
@bors

bors commented May 23, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6e81f82 with merge e6bb10d673b9ef4119e5f9de26bd4dd2a138b8c3...

@emilyalbiniemilyalbini added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels May 23, 2019
@cuviper

cuviper commented May 23, 2019

Copy link
Copy Markdown
Member

There's no such label, but let's not forget this for master/nightly too...

@varkor

varkor commented May 23, 2019

Copy link
Copy Markdown
Contributor

@cuviper: #60989 isn't being marked as fix, so we have the issue to remind us 👍

@bors

bors commented May 23, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 23, 2019
@estebankestebank mentioned this pull request May 23, 2019
Closed
@cuviper

cuviper commented May 23, 2019

Copy link
Copy Markdown
Member

I don't know if this is spurious, but the rls test failure is here:
https://ci.appveyor.com/project/rust-lang/rust/builds/24765767/job/c72eopevht8wxajk#L10885

thread 'client_changing_workspace_lib_retains_diagnostics' panicked at 'assertion failed: bin.diagnostics[0].message.contains("mismatched types\n\nexpected u32, found u64")', src\tools\rls\tests\client.rs:275:5

@varkor

varkor commented May 23, 2019

Copy link
Copy Markdown
Contributor

@bors retry

@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 May 23, 2019
@varkor

varkor commented May 23, 2019

Copy link
Copy Markdown
Contributor

(I'm also not sure, but this is blocking the stable release, so I'm going to hope it was.)

@varkorvarkor mentioned this pull request May 23, 2019
Merged
@bors

bors commented May 23, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6e81f82 with merge 6c8dd30950da3cc2a89b3e211e1ac1743c67421c...

@varkorvarkor mentioned this pull request May 23, 2019
Merged
@eddyb

eddyb commented May 23, 2019

Copy link
Copy Markdown
Contributor

cc @Xanewok for #61085 (comment)

@emilyalbini

emilyalbini commented May 23, 2019

Copy link
Copy Markdown
Member

Yeah that should be spurious.

@emilyalbiniemilyalbini removed beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels May 23, 2019
@emilyalbini

emilyalbini commented May 23, 2019

Copy link
Copy Markdown
Member

Unfortunately we can't include this into 1.35.0: the spurious failure moved the tentative release time to around 2AM in my timezone, and y'all don't want me doing a release that late. @eddyb or @oli-obk, can any of you rebase this PR on master and beta-nominated+stable-nominated it?

Closing this PR.

@bors r- retry

@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 May 23, 2019
@eddyb

eddyb commented May 23, 2019

Copy link
Copy Markdown
Contributor

Note for whoever wants to rebase this on master (before I have a chance to look at it): Def was renamed to Res, so at the very least there's that, but also rewrite_self_ctor might have changed its signature and may be more aggressive now. (if so, it should be changed to return just Res)

@ehussehuss mentioned this pull request May 29, 2019
Closed
@eddybeddyb mentioned this pull request Jun 16, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@eddybeddybeddyb left review comments
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@emilyalbiniemilyalbini

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@oli-obk@rust-highfive@petrochenkov@eddyb@emilyalbini@varkor@bors@cuviper@Centril