Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 5 pull requests #69235

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.

Sign up for GitHub

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

Closed
wants to merge 10 commits into from
Closed

Rollup of 5 pull requests #69235

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
84f3356
Simplify `Skip::nth` and `Skip::last` implementations
ollie27 Jan 28, 2020
67068f3
macOS: avoid calling pthread_self() twice
kubo39 Feb 2, 2020
a9b5c69
Ignore GDB versions with broken str printing.
spunit262 Feb 14, 2020
c53693d
Handle recursion_limit parsing errors
Dec 13, 2019
e5b2c66
Do not ICE when encountering `yield` inside `async` block
estebank Feb 15, 2020
3747a48
Rollup merge of #67272 - fisherdarling:master, r=varkor,hellow554
Dylan-DPC Feb 17, 2020
034b334
Rollup merge of #68597 - ollie27:skip_nth_last, r=Amanieu
Dylan-DPC Feb 17, 2020
a70b757
Rollup merge of #68767 - kubo39:patch-macos, r=shepmaster
Dylan-DPC Feb 17, 2020
5ba1dd7
Rollup merge of #69175 - estebank:shall-not-ice, r=petrochenkov
Dylan-DPC Feb 17, 2020
386b494
Rollup merge of #69223 - spunit262:empty-string-gdb-version, r=Dylan-DPC
Dylan-DPC Feb 17, 2020
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
5 changes: 3 additions & 2 deletions src/libstd/sys/unix/thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,9 @@ pub mod guard {

#[cfg(target_os = "macos")]
unsafe fn get_stack_start() -> Option<*mut libc::c_void> {
let stackaddr = libc::pthread_get_stackaddr_np(libc::pthread_self()) as usize
- libc::pthread_get_stacksize_np(libc::pthread_self());
let th = libc::pthread_self();
let stackaddr =
libc::pthread_get_stackaddr_np(th) as usize - libc::pthread_get_stacksize_np(th);
Some(stackaddr as *mut libc::c_void)
}

Expand Down