Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Rollup of 5 pull requests #72041

Merged
merged 19 commits into from
May 9, 2020
Merged

Rollup of 5 pull requests #72041

merged 19 commits into from
May 9, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented May 9, 2020

Successful merges:

Failed merges:

r? @ghost

maurer and others added 19 commits April 29, 2020 13:38
LLVM TargetMachines default to using the (now-legacy) .ctors
representation of init functions. Mixing .ctors and .init_array
representations can cause issues when linking with lld.

This happens in practice for:

* Our profiling runtime which is currently implicitly built with
  .init_array since it is built by clang, which sets this field.
* External C/C++ code that may be linked into the same process.

To support legacy systems which may use .ctors, targets may now specify
that they use .ctors via the use_ctors attribute which defaults to
false.

For debugging and manual control, -Z use-ctors-section=yes/no will allow
manual override.

Fixes: rust-lang#71233
upgrade chalk and use chalk-solve/chalk-ir/chalk-rust-ir

Reintegrate chalk into rustc.

r? @nikomatsakis
cc. @rust-lang/wg-traits
rustllvm: Use .init_array rather than .ctors

LLVM TargetMachines default to using the (now-legacy) .ctors
representation of init functions. Mixing .ctors and .init_array
representations can cause issues when linking with lld.

This happens in practice for:

* Our profiling runtime which is currently implicitly built with
  .init_array since it is built by clang, which sets this field.
* External C/C++ code that may be linked into the same process.

Fixes: rust-lang#71233
Simplify the `tcx.alloc_map` API

This PR changes all functions that require manually locking the `alloc_map` to functions on `TyCtxt` that lock the map internally. In the same step we make the `TyCtxt::alloc_map` field private.

r? @RalfJung
Remove ast::{Ident, Name} reexports.

The reexport of `Symbol` into `Name` confused me.
@RalfJung
Copy link
Member Author

RalfJung commented May 9, 2020

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 9, 2020

📌 Commit 366c178 has been approved by RalfJung

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 9, 2020
@RalfJung RalfJung added the rollup A PR which is a rollup label May 9, 2020
@bors
Copy link
Collaborator

bors commented May 9, 2020

⌛ Testing commit 366c178 with merge 96bbd80b1bf132494d0d44678214206b369d4edf...

@bors
Copy link
Collaborator

bors commented May 9, 2020

💥 Test timed out

@bors bors 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 9, 2020
@RalfJung
Copy link
Member Author

RalfJung commented May 9, 2020

cc @rust-lang/infra we got a timeout?

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 9, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 9, 2020
@bors
Copy link
Collaborator

bors commented May 9, 2020

⌛ Testing commit 366c178 with merge bad3bf6...

@Mark-Simulacrum
Copy link
Member

AFAICT macOS auto (dist-x86_64-apple builder got stuck checking out code (I can't see the actual log though). cc #71988

@Dylan-DPC-zz
Copy link

ye happens once in a while

@bors
Copy link
Collaborator

bors commented May 9, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: RalfJung
Pushing bad3bf6 to master...

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants