Skip to content

Translate shims using MIR - #39628

Merged
bors merged 11 commits into
rust-lang:masterfrom
arielb1:shimmir
Mar 20, 2017
Merged

Translate shims using MIR#39628
bors merged 11 commits into
rust-lang:masterfrom
arielb1:shimmir

Conversation

@arielb1

@arielb1arielb1 commented Feb 7, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

This removes one large remaining part of old trans.

@rust-highfive

rust-highfive commented Feb 7, 2017

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

@bors

bors commented Feb 9, 2017

Copy link
Copy Markdown
Collaborator

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

@KalitaAlexey

KalitaAlexey commented Feb 9, 2017

Copy link
Copy Markdown
Contributor

Hi @arielb1,
Will you describe your changes?
I am interested in what you are doing.

@arielb1

arielb1 commented Feb 9, 2017

Copy link
Copy Markdown
ContributorAuthor

@KalitaAlexey

Some functions in Rust, such as enum variant constructions (e.g. Option::<u32>::Some) and some trait methods (e.g. <fn(u32) as Fn(u32)>::call) are implemented through "shims". I am translating these shims more like normal functions.

@solsonsolson mentioned this pull request Feb 13, 2017
Closed
@eddyb

eddyb commented Feb 13, 2017

Copy link
Copy Markdown
Contributor

cc @rust-lang/compiler

@mrhota

mrhota commented Feb 15, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

@arielb1 to what end? what you're doing and why you're doing it are equally important. Your commit messages don't provide information on your rationale 🙁

@jonas-schievink

jonas-schievink commented Feb 15, 2017

Copy link
Copy Markdown
Contributor

@mrhota less special-casing and less convoluted code in the compiler

@solson

solson commented Feb 15, 2017

Copy link
Copy Markdown
Contributor

It also pulls trans-specific code out into MIR in a way that will work for alternative backends (e.g. miri, mir2wasm), reducing duplication between them.

nikomatsakis
nikomatsakis reviewed Feb 17, 2017
View reviewed changes
Comment threadsrc/librustc/ty/instance.rs Outdated

@nikomatsakisnikomatsakisFeb 17, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

A more explicit comment would be nice -- It's not clear to me what the Ty<'tcx> represents here.

@bors

bors commented Feb 25, 2017

Copy link
Copy Markdown
Collaborator

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

@arielb1
arielb1force-pushed the shimmir branch 2 times, most recently from f52b583 to 6f607d6CompareMarch 7, 2017 23:42
eddyb
eddyb reviewed Mar 9, 2017
View reviewed changes
Comment threadsrc/librustc_mir/util/elaborate_drops.rs Outdated

@eddybeddybMar 9, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this file not in librustc_mir/transform?

@arielb1arielb1Mar 9, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Because it's not a MIR pass.

eddyb
eddyb approved these changes Mar 9, 2017
View reviewed changes

@eddybeddyb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM so far! r=me with those extra FIXMEs if you want to land it like this

Comment threadsrc/librustc/ty/context.rs Outdated

@eddybeddybMar 9, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you put a FIXME on these to eventually integrate them better with the rest of on-demand?

Comment threadsrc/librustc/ty/mod.rs Outdated

@eddybeddybMar 9, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same FIXME here, I suppose.

eddyb
eddyb reviewed Mar 9, 2017
View reviewed changes
Comment threadsrc/librustc/ty/context.rs Outdated

@eddybeddybMar 9, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

But if you have a dep_node method, you can use it to move this to on-demand.

@arielb1
arielb1force-pushed the shimmir branch 2 times, most recently from 7d069ec to bd92573CompareMarch 9, 2017 22:27
@bors

bors commented Mar 11, 2017

Copy link
Copy Markdown
Collaborator

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

@arielb1arielb1 changed the title [WIP] translate shims using MIRTranslate shims using MIRMar 15, 2017
@arielb1

arielb1 commented Mar 15, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Now ready (except for cleanup, and I prefer to land it now given that this PR is rather big enough already). r? @eddyb

@rust-highfiverust-highfive assigned eddyb and unassigned pnkfelixMar 15, 2017
@arielb1
arielb1force-pushed the shimmir branch 3 times, most recently from 040f333 to 9f5def1CompareMarch 16, 2017 12:12
@eddyb

eddyb commented Mar 19, 2017

Copy link
Copy Markdown
Contributor

I can't see the end of that appveyor log.

@arielb1

arielb1 commented Mar 19, 2017

Copy link
Copy Markdown
ContributorAuthor

sccache failure

@bors retry

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5dc8548 with merge 35617fc...

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@arielb1

arielb1 commented Mar 20, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5dc8548 with merge 0b1ddef...

@arielb1

arielb1 commented Mar 20, 2017

Copy link
Copy Markdown
ContributorAuthor

Mac builders offline

@bors retry

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5dc8548 with merge 5e30f81...

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@arielb1

arielb1 commented Mar 20, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors retry

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5dc8548 with merge 134c4a0...

bors added a commit that referenced this pull request Mar 20, 2017
@bors
Auto merge of#39628- arielb1:shimmir, r=eddyb
134c4a0
Translate shims using MIR
This removes one large remaining part of old trans.
@arielb1

arielb1 commented Mar 20, 2017

Copy link
Copy Markdown
ContributorAuthor

Mac test timeout?

@bors retry

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing 134c4a0 to master...

@bors
bors merged commit 5dc8548 into rust-lang:masterMar 20, 2017
This was referenced Mar 20, 2017
Merged
Merged
Merged
Merged
Merged
Merged
Closed
Merged
Merged
@dwrenshadwrensha mentioned this pull request Mar 21, 2017
Merged
@ahicks92ahicks92 mentioned this pull request Mar 26, 2017
Merged
@arielb1arielb1 mentioned this pull request Mar 30, 2017
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis left review comments
+1 more reviewer
@eddybeddybeddyb approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@arielb1@rust-highfive@bors@KalitaAlexey@eddyb@mrhota@jonas-schievink@solson@nikomatsakis@pnkfelix