Skip to content

#6314 Change atomic intrinsics to accept raw pointers #7638

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 3 commits into from
Closed

#6314 Change atomic intrinsics to accept raw pointers #7638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1774568
Change the type of pointer accepted by atomic intrinsics to raw (#6314)
Jul 1, 2013
6e43070
Change pointer type of atomic intrinsics parameters to raw (#6314)
Jul 1, 2013
341dd77
Update test cases for atomic intrinsics (#6314)
Jul 5, 2013
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
42 changes: 22 additions & 20 deletions src/librustc/middle/typeck/check/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3476,29 +3476,31 @@ pub fn check_intrinsic_type(ccx: @mut CrateCtxt, it: @ast::foreign_item) {

//We only care about the operation here
match split[1] {
"cxchg" => (0, ~[ty::mk_mut_rptr(tcx,
ty::re_bound(ty::br_anon(0)),
ty::mk_int()),
ty::mk_int(),
ty::mk_int()
], ty::mk_int()),
"load" => (0,
~[
ty::mk_imm_rptr(tcx, ty::re_bound(ty::br_anon(0)), ty::mk_int())
],
ty::mk_int()),
"store" => (0,
~[
ty::mk_mut_rptr(tcx, ty::re_bound(ty::br_anon(0)), ty::mk_int()),
ty::mk_int()
],
ty::mk_nil()),
"cxchg" => {
(0,
~[
ty::mk_mut_ptr(tcx, ty::mk_int()),
ty::mk_int(),
ty::mk_int()
],
ty::mk_int())
}
"load" => {
(0,
~[ty::mk_imm_ptr(tcx, ty::mk_int())],
ty::mk_int())
}
"store" => {
(0,
~[ty::mk_mut_ptr(tcx, ty::mk_int()), ty::mk_int()],
ty::mk_nil())
}

"xchg" | "xadd" | "xsub" | "and" | "nand" | "or" | "xor" | "max" |
"min" | "umax" | "umin" => {
(0, ~[ty::mk_mut_rptr(tcx,
ty::re_bound(ty::br_anon(0)),
ty::mk_int()), ty::mk_int() ], ty::mk_int())
(0,
~[ty::mk_mut_ptr(tcx, ty::mk_int()), ty::mk_int()],
ty::mk_int())
}

op => {
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/rt/comm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ impl<T> Peekable<T> for PortOne<T> {
fn peek(&self) -> bool {
unsafe {
let packet: *mut Packet<T> = self.inner.packet();
let oldstate = atomic_load(&mut (*packet).state);
let oldstate = atomic_load(&(*packet).state);
match oldstate {
STATE_BOTH => false,
STATE_ONE => (*packet).payload.is_some(),
Expand Down
Loading