Preparatory refactorings for collector-driven trans. by michaelwoerister · Pull Request #33473 · rust-lang/rust

michaelwoerister · 2016-05-06T19:48:07Z

This is a set of refactorings that allows to do translation item collection and partitioning before LocalCrateContext instances or LLVM modules are generated. As a consequence we can now create LocalCrateContexts already with knowledge of the codegen unit it will be used for. This is a preparation step for driving trans by the results of codegen unit partitioning.

rust-highfive · 2016-05-06T19:48:19Z

r? @pnkfelix

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

michaelwoerister · 2016-05-06T19:49:04Z

cc @rust-lang/compiler

nikomatsakis · 2016-05-06T19:52:34Z

@@ -1191,7 +1191,7 @@ fn create_trans_items_for_default_impls<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
 assert!(mth.is_provided);


this commit seems good

nikomatsakis · 2016-05-06T20:04:23Z

@michaelwoerister this seems pretty unobjectionable. r=me but some nits:

can we rename ccx to scx in those cases where we no longer take a CrateContext but just a SharedCrateContext?
I feel like there should be a comment explaining how the various parts fit together; that could perhaps be deferred until things are a bit more settled. But right now there seems to be a lot of XxxCrateContext data structures and the organization thereof is a bit unclear.

michaelwoerister · 2016-05-06T20:24:28Z

Great. Thanks for the quick review!

michaelwoerister · 2016-05-06T21:22:50Z

@bors r=nikomatsakis

bors · 2016-05-06T21:22:51Z

📌 Commit b37d7a4 has been approved by nikomatsakis

…, r=nikomatsakis Preparatory refactorings for collector-driven trans. This is a set of refactorings that allows to do translation item collection and partitioning before LocalCrateContext instances or LLVM modules are generated. As a consequence we can now create LocalCrateContexts already with knowledge of the codegen unit it will be used for. This is a preparation step for driving trans by the results of codegen unit partitioning.

Rollup of 8 pull requests - Successful merges: #33369, #33373, #33404, #33406, #33420, #33424, #33426, #33473 - Failed merges:

bors · 2016-05-09T10:14:57Z

⌛ Testing commit b37d7a4 with merge e2c69e3...

bors · 2016-05-09T10:29:57Z

💔 Test failed - auto-linux-64-cross-freebsd

bors · 2016-05-09T13:44:46Z

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

michaelwoerister · 2016-05-09T16:02:35Z

@bors r=nikomatsakis

rebased ...

bors · 2016-05-09T16:02:36Z

📌 Commit 30e19aa has been approved by nikomatsakis

Manishearth · 2016-05-09T19:48:00Z

(fails travis)

…ntext.

…ext. Plus make it produce a nicer dependency graph via DepTrackingMap::memoize().

…eContext.

…efore creating LocalCrateContexts.

…be added.

michaelwoerister · 2016-05-09T20:34:26Z

@bors r=nikomatsakis

bors · 2016-05-09T20:34:27Z

📌 Commit 118cc9e has been approved by nikomatsakis

bors · 2016-05-10T06:50:10Z

⌛ Testing commit 118cc9e with merge 1939b76...

…sakis Preparatory refactorings for collector-driven trans. This is a set of refactorings that allows to do translation item collection and partitioning before LocalCrateContext instances or LLVM modules are generated. As a consequence we can now create LocalCrateContexts already with knowledge of the codegen unit it will be used for. This is a preparation step for driving trans by the results of codegen unit partitioning.

bors · 2016-05-10T09:10:19Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

rust-highfive assigned pnkfelix May 6, 2016

nikomatsakis reviewed May 6, 2016
View reviewed changes

michaelwoerister unassigned pnkfelix May 6, 2016

Manishearth mentioned this pull request May 8, 2016
Rollup of 8 pull requests #33494
Merged

bors added a commit that referenced this pull request May 8, 2016
Auto merge of#33494- Manishearth:rollup, r=Manishearth
db94e38
Rollup of 8 pull requests - Successful merges: #33369, #33373, #33404, #33406, #33420, #33424, #33426, #33473 - Failed merges:

bors added a commit that referenced this pull request May 8, 2016
Auto merge of#33494- Manishearth:rollup, r=Manishearth
cae42a4
Rollup of 8 pull requests - Successful merges: #33369, #33373, #33404, #33406, #33420, #33424, #33426, #33473 - Failed merges:

michaelwoerister force-pushed the split-cratecontext branch from b37d7a4 to 30e19aaCompare May 9, 2016 16:01

michaelwoerister added 16 commits May 9, 2016 16:17

trans: Split LocalCrateContext ownership out of SharedCrateContext.
b2ea54d

Make trans::collector item printing methods independent of CrateContext.
60259b9

trans: Make normalize_and_test_predicates() not depend on CrateContext.
100a4f5

trans: Make meth::get_vtable_methods() not depend on CrateContext.
2564199

trans: Make various trans::collector functions independent of CrateCo…
d24ead0
…ntext.

trans: Make common::fulfill_obligation only depend on SharedCrateCont…
566aa54
…ext. Plus make it produce a nicer dependency graph via DepTrackingMap::memoize().

trans: Make base::custom_coerce_unsize_info only depend on SharedCrat…
3f74c6a
…eContext.

trans: Make glue::get_drop_glue_type() independent of CrateContext.
75bf617

Make trans::collector only depend on SharedCrateContext.
bb8c8c5

Restructure trans_crate() so that codegen unit partitioning happens b…
bebcb28
…efore creating LocalCrateContexts.

trans: Make partitioning available in LocalCrateContext.
a8e34df

trans: Add some explanatory comments to trans::context types.
0142336

Make FixedCount partitioning handle case where codegen units have to …
b89a5d1
…be added.

trans: Consistently name SharedCrateContext instances 'scx'
86a691a

trans::context: Remove some tcx::tls wackiness
00eabcb

Fix some rebasing fallout.
118cc9e

michaelwoerister force-pushed the split-cratecontext branch from 30e19aa to 118cc9eCompare May 9, 2016 20:17

bors merged commit 118cc9e into rust-lang:masterMay 10, 2016

		@@ -1191,7 +1191,7 @@ fn create_trans_items_for_default_impls<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
		assert!(mth.is_provided);

Uh oh!

Uh oh!

Conversation

michaelwoerister commented May 6, 2016

Uh oh!

rust-highfive commented May 6, 2016

Uh oh!

michaelwoerister commented May 6, 2016

Uh oh!

nikomatsakisMay 6, 2016

Choose a reason for hiding this comment

Uh oh!

nikomatsakis commented May 6, 2016

Uh oh!

michaelwoerister commented May 6, 2016

Uh oh!

michaelwoerister commented May 6, 2016

Uh oh!

bors commented May 6, 2016

Uh oh!

bors commented May 9, 2016

Uh oh!

bors commented May 9, 2016

Uh oh!

bors commented May 9, 2016

Uh oh!

michaelwoerister commented May 9, 2016

Uh oh!

bors commented May 9, 2016

Uh oh!

Manishearth commented May 9, 2016

Uh oh!

michaelwoerister commented May 9, 2016

Uh oh!

bors commented May 9, 2016

Uh oh!

bors commented May 10, 2016

Uh oh!

bors commented May 10, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants