Skip to content

Commit

Permalink
implement raw pointer comparisons in librustc
Browse files Browse the repository at this point in the history
This is mostly for consistency, as you can now compare raw pointers in
constant expressions or without the standard library.

It also reduces the number of `ptrtoint` instructions in the IR, making
tracking down culprits of what's usually an anti-pattern easier.
  • Loading branch information
thestinger committed Sep 12, 2013
1 parent 6216661 commit b7435cf
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 5 deletions.
5 changes: 4 additions & 1 deletion src/librustc/middle/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4266,6 +4266,7 @@ pub fn is_binopable(cx: ctxt, ty: t, op: ast::BinOp) -> bool {
static tycat_int: int = 3;
static tycat_float: int = 4;
static tycat_bot: int = 5;
static tycat_raw_ptr: int = 6;

static opcat_add: int = 0;
static opcat_sub: int = 1;
Expand Down Expand Up @@ -4309,6 +4310,7 @@ pub fn is_binopable(cx: ctxt, ty: t, op: ast::BinOp) -> bool {
ty_int(_) | ty_uint(_) | ty_infer(IntVar(_)) => tycat_int,
ty_float(_) | ty_infer(FloatVar(_)) => tycat_float,
ty_bot => tycat_bot,
ty_ptr(_) => tycat_raw_ptr,
_ => tycat_other
}
}
Expand All @@ -4323,7 +4325,8 @@ pub fn is_binopable(cx: ctxt, ty: t, op: ast::BinOp) -> bool {
/*char*/ [f, f, f, f, t, t, f, f],
/*int*/ [t, t, t, t, t, t, t, f],
/*float*/ [t, t, t, f, t, t, f, f],
/*bot*/ [t, t, t, t, f, f, t, t]];
/*bot*/ [t, t, t, t, f, f, t, t],
/*raw ptr*/ [f, f, f, f, t, t, f, f]];

return tbl[tycat(cx, ty)][opcat(op)];
}
Expand Down
68 changes: 64 additions & 4 deletions src/libstd/ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ impl<T> RawPtr<T> for *mut T {
}

// Equality for pointers
#[cfg(not(test))]
#[cfg(stage0, not(test))]
impl<T> Eq for *T {
#[inline]
fn eq(&self, other: &*T) -> bool {
Expand All @@ -393,7 +393,17 @@ impl<T> Eq for *T {
fn ne(&self, other: &*T) -> bool { !self.eq(other) }
}

#[cfg(not(test))]
#[cfg(not(stage0), not(test))]
impl<T> Eq for *T {
#[inline]
fn eq(&self, other: &*T) -> bool {
*self == *other
}
#[inline]
fn ne(&self, other: &*T) -> bool { !self.eq(other) }
}

#[cfg(stage0, not(test))]
impl<T> Eq for *mut T {
#[inline]
fn eq(&self, other: &*mut T) -> bool {
Expand All @@ -403,6 +413,16 @@ impl<T> Eq for *mut T {
fn ne(&self, other: &*mut T) -> bool { !self.eq(other) }
}

#[cfg(not(stage0), not(test))]
impl<T> Eq for *mut T {
#[inline]
fn eq(&self, other: &*mut T) -> bool {
*self == *other
}
#[inline]
fn ne(&self, other: &*mut T) -> bool { !self.eq(other) }
}

// Equivalence for pointers
#[cfg(not(test))]
impl<T> Equiv<*mut T> for *T {
Expand Down Expand Up @@ -460,7 +480,7 @@ mod externfnpointers {
}

// Comparison for pointers
#[cfg(not(test))]
#[cfg(stage0, not(test))]
impl<T> Ord for *T {
#[inline]
fn lt(&self, other: &*T) -> bool {
Expand All @@ -480,7 +500,27 @@ impl<T> Ord for *T {
}
}

#[cfg(not(test))]
#[cfg(not(stage0), not(test))]
impl<T> Ord for *T {
#[inline]
fn lt(&self, other: &*T) -> bool {
*self < *other
}
#[inline]
fn le(&self, other: &*T) -> bool {
*self <= *other
}
#[inline]
fn ge(&self, other: &*T) -> bool {
*self >= *other
}
#[inline]
fn gt(&self, other: &*T) -> bool {
*self > *other
}
}

#[cfg(stage0, not(test))]
impl<T> Ord for *mut T {
#[inline]
fn lt(&self, other: &*mut T) -> bool {
Expand All @@ -500,6 +540,26 @@ impl<T> Ord for *mut T {
}
}

#[cfg(not(stage0), not(test))]
impl<T> Ord for *mut T {
#[inline]
fn lt(&self, other: &*mut T) -> bool {
*self < *other
}
#[inline]
fn le(&self, other: &*mut T) -> bool {
*self <= *other
}
#[inline]
fn ge(&self, other: &*mut T) -> bool {
*self >= *other
}
#[inline]
fn gt(&self, other: &*mut T) -> bool {
*self > *other
}
}

#[cfg(test)]
pub mod ptr_tests {
use super::*;
Expand Down

0 comments on commit b7435cf

Please sign in to comment.