Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #56581

Merged
merged 27 commits into from
Dec 7, 2018
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
47b5e23
Introduce ptr::hash for references
dwijnand Nov 26, 2018
86d20f9
FIXME is the new TODO
dwijnand Nov 26, 2018
5558c07
Fix ptr::hex doc example
dwijnand Nov 26, 2018
7b429b0
Fix stability attribute for ptr::hash
dwijnand Nov 27, 2018
8125149
Pick a better variable name for ptr::hash
dwijnand Nov 27, 2018
afb4fbd
Add an assert_eq in ptr::hash's doc example
dwijnand Nov 27, 2018
4a7ffe2
Fix issue number
dwijnand Nov 27, 2018
9755410
Try to fix ptr::hash's doc example
dwijnand Nov 27, 2018
097b5db
Move feature enable in ptr::hash doc example
dwijnand Nov 27, 2018
6fab3f9
Make ptr::hash take a raw painter like ptr::eq
dwijnand Dec 4, 2018
ad76569
Fix ptr::hash, just hash the raw pointer
dwijnand Dec 4, 2018
0f47c2a
Add Armv8-M Mainline targets
hug-dev Nov 13, 2018
c025d61
Replace usages of `..i + 1` ranges with `..=i`.
frewsxcv Dec 4, 2018
84443a3
Send textual profile data to stderr, not stdout
Mark-Simulacrum Dec 6, 2018
7df4b81
Fix bug in from_key_hashed_nocheck
Zoxc Dec 6, 2018
b6d3668
Fix a stutter in the docs for slice::exact_chunks
cbarrick Dec 6, 2018
ecd5efa
Show usages of query cycles and correctly shift queries in a cycle
Zoxc Dec 2, 2018
4fac739
Fix a race condition
Zoxc Dec 2, 2018
93294ea
Fix
Zoxc Dec 3, 2018
813b484
Fix printing of spans with no TyCtxt
Zoxc Dec 3, 2018
92638ef
Rollup merge of #56000 - hug-dev:armv8m.main, r=alexcrichton
kennytm Dec 7, 2018
6d3501e
Rollup merge of #56250 - dwijnand:ptr-hash, r=alexcrichton
kennytm Dec 7, 2018
6a07f23
Rollup merge of #56434 - Zoxc:par-tests, r=michaelwoerister
kennytm Dec 7, 2018
0e41ef1
Rollup merge of #56516 - frewsxcv:frewsxcv-eq, r=Mark-Simulacrum
kennytm Dec 7, 2018
aa5ba83
Rollup merge of #56555 - Mark-Simulacrum:stderr-profile, r=wesleywiser
kennytm Dec 7, 2018
06f3b57
Rollup merge of #56561 - Zoxc:too-raw, r=Gankro
kennytm Dec 7, 2018
a40aa45
Rollup merge of #56574 - cbarrick:master, r=varkor
kennytm Dec 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/librustc/ty/query/job.rs
Original file line number Diff line number Diff line change
@@ -103,8 +103,11 @@ impl<'tcx> QueryJob<'tcx> {
condvar: Condvar::new(),
});
self.latch.await(&waiter);

match Lrc::get_mut(&mut waiter).unwrap().cycle.get_mut().take() {
// FIXME: Get rid of this lock. We have ownership of the QueryWaiter
// although another thread may still have a Lrc reference so we cannot
// use Lrc::get_mut
let mut cycle = waiter.cycle.lock();
match cycle.take() {
None => Ok(()),
Some(cycle) => Err(cycle)
}