---

yaml
---
r: 44647
b: refs/heads/master
c: bad4463
h: refs/heads/master
i:
  44645: 5955df0
  44643: 4e0f101
  44639: da710e9
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8f8f0ec2c6761b096eea1f8dceb42c2618f5a196
+refs/heads/master: bad4463a6b793aa627afe5aeb6a4af54b9562c23
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/etc/x86.supp

@@ -366,55 +366,6 @@
    ...
 }
 
-{
-   enum-instruction-scheduling-1
-   Memcheck:Cond
-   fun:*fold_mod*
-   ...
-}
-
-{
-   enum-instruction-scheduling-2
-   Memcheck:Cond
-   fun:*fold_nmod*
-   ...
-}
-
-{
-   enum-instruction-scheduling-3
-   Memcheck:Cond
-   fun:*fold_crate*
-   ...
-}
-
-{
-   enum-instruction-scheduling-4
-   Memcheck:Cond
-   fun:*fold_enum*
-   ...
-}
-
-{
-   enum-instruction-scheduling-5
-   Memcheck:Cond
-   fun:*write_variant*
-   ...
-}
-
-{
-   enum-instruction-scheduling-6
-   Memcheck:Cond
-   fun:*merge_method_attrs*
-   ...
-}
-
-{
-   enum-instruction-scheduling-7
-   Memcheck:Cond
-   fun:*parse_config_*
-   ...
-}
-
 {  
    llvm-user-new-leak
    Memcheck:Leak

trunk/src/librustc/lib/llvm.rs

@@ -184,15 +184,6 @@ pub enum FileType {
     ObjectFile = 1
 }
 
-pub enum Metadata {
-    MD_dbg = 0,
-    MD_tbaa = 1,
-    MD_prof = 2,
-    MD_fpmath = 3,
-    MD_range = 4,
-    MD_tbaa_struct = 5
-}
-
 // Opaque pointer types
 pub enum Module_opaque {}
 pub type ModuleRef = *Module_opaque;

trunk/src/librustc/middle/trans/_match.rs

@@ -1361,29 +1361,13 @@ pub fn compile_submatch(bcx: block,
     if opts.len() > 0u {
         match opts[0] {
             var(_, vdef) => {
-                let variants = ty::enum_variants(tcx, vdef.enm);
-                if variants.len() == 1 {
+                if (*ty::enum_variants(tcx, vdef.enm)).len() == 1u {
                     kind = single;
                 } else {
                     let enumptr =
                         PointerCast(bcx, val, T_opaque_enum_ptr(ccx));
                     let discrimptr = GEPi(bcx, enumptr, [0u, 0u]);
-
-
-                    assert variants.len() > 1;
-                    let min_discrim = do variants.foldr(0) |&x, y| {
-                        int::min(x.disr_val, y)
-                    };
-                    let max_discrim = do variants.foldr(0) |&x, y| {
-                        int::max(x.disr_val, y)
-                    };
-
-                    test_val = LoadRangeAssert(bcx, discrimptr,
-                                               min_discrim as c_ulonglong,
-                                               (max_discrim + 1)
-                                               as c_ulonglong,
-                                               lib::llvm::True);
-
+                    test_val = Load(bcx, discrimptr);
                     kind = switch;
                 }
             }

trunk/src/librustc/middle/trans/build.rs

@@ -14,9 +14,8 @@ use lib::llvm::llvm;
 use lib::llvm::{CallConv, TypeKind, AtomicBinOp, AtomicOrdering};
 use lib::llvm::{Opcode, IntPredicate, RealPredicate, True, False};
 use lib::llvm::{ValueRef, TypeRef, BasicBlockRef, BuilderRef, ModuleRef};
-use libc::{c_uint, c_int, c_ulonglong};
+use libc::{c_uint, c_int};
 use middle::trans::common::*;
-use middle::trans::machine::llsize_of_real;
 
 use core::cast::transmute;
 use core::cast;
@@ -537,25 +536,6 @@ pub fn Load(cx: block, PointerVal: ValueRef) -> ValueRef {
     }
 }
 
-pub fn LoadRangeAssert(cx: block, PointerVal: ValueRef, lo: c_ulonglong,
-                       hi: c_ulonglong, signed: lib::llvm::Bool) -> ValueRef {
-    let value = Load(cx, PointerVal);
-
-    unsafe {
-        let t = llvm::LLVMGetElementType(llvm::LLVMTypeOf(PointerVal));
-        let min = llvm::LLVMConstInt(t, lo, signed);
-        let max = llvm::LLVMConstInt(t, hi, signed);
-
-
-        do vec::as_imm_buf([min, max]) |ptr, len| {
-            llvm::LLVMSetMetadata(value, lib::llvm::MD_range as c_uint,
-                                  llvm::LLVMMDNode(ptr, len as c_uint));
-        }
-    }
-
-    value
-}
-
 pub fn Store(cx: block, Val: ValueRef, Ptr: ValueRef) {
     unsafe {
         if cx.unreachable { return; }

trunk/src/librustc/middle/trans/datum.rs

@@ -431,13 +431,7 @@ pub impl Datum {
         } else {
             match self.mode {
                 ByValue => self.val,
-                ByRef => {
-                    if ty::type_is_bool(self.ty) {
-                        LoadRangeAssert(bcx, self.val, 0, 2, lib::llvm::True)
-                    } else {
-                        Load(bcx, self.val)
-                    }
-                }
+                ByRef => Load(bcx, self.val)
             }
         }
     }

trunk/src/librustc/middle/trans/expr.rs

@@ -491,29 +491,11 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
         ast::expr_swap(dst, src) => {
             let dst_datum = unpack_datum!(bcx, trans_lvalue(bcx, dst));
             let src_datum = unpack_datum!(bcx, trans_lvalue(bcx, src));
+            let scratch = scratch_datum(bcx, dst_datum.ty, false);
 
-            // If the source and destination are the same, then don't swap.
-            // Avoids performing an overlapping memcpy
-            let dst_datum_ref = dst_datum.to_ref_llval(bcx);
-            let src_datum_ref = src_datum.to_ref_llval(bcx);
-            let cmp = ICmp(bcx, lib::llvm::IntEQ,
-                           src_datum_ref,
-                           dst_datum_ref);
-
-            let swap_cx = base::sub_block(bcx, ~"swap");
-            let next_cx = base::sub_block(bcx, ~"next");
-
-            CondBr(bcx, cmp, next_cx.llbb, swap_cx.llbb);
-
-            let scratch = scratch_datum(swap_cx, dst_datum.ty, false);
-
-            let swap_cx = dst_datum.move_to_datum(swap_cx, INIT, scratch);
-            let swap_cx = src_datum.move_to_datum(swap_cx, INIT, dst_datum);
-            let swap_cx = scratch.move_to_datum(swap_cx, INIT, src_datum);
-
-            Br(swap_cx, next_cx.llbb);
-
-            return next_cx;
+            let bcx = dst_datum.move_to_datum(bcx, INIT, scratch);
+            let bcx = src_datum.move_to_datum(bcx, INIT, dst_datum);
+            return scratch.move_to_datum(bcx, INIT, src_datum);
         }
         ast::expr_assign_op(op, dst, src) => {
             return trans_assign_op(bcx, expr, op, dst, src);

trunk/src/librustc/middle/ty.rs

@@ -2823,7 +2823,7 @@ pub pure fn ty_fn_ret(fty: t) -> t {
     }
 }
 
-pub fn is_fn_ty(fty: t) -> bool {
+fn is_fn_ty(fty: t) -> bool {
     match get(fty).sty {
         ty_bare_fn(_) => true,
         ty_closure(_) => true,

trunk/src/librustc/middle/typeck/check/_match.rs

@@ -92,7 +92,7 @@ pub fn check_pat_variant(pcx: pat_ctxt, pat: @ast::pat, path: @ast::path,
     match structure_of(pcx.fcx, pat.span, expected) {
         ty::ty_enum(_, ref expected_substs) => {
             // Lookup the enum and variant def ids:
-            let v_def = lookup_def(pcx.fcx, pat.span, pat.id);
+            let v_def = lookup_def(pcx.fcx, path.span, pat.id);
             let v_def_ids = ast_util::variant_def_ids(v_def);
 
             // Assign the pattern the type of the *enum*, not the variant.
@@ -125,17 +125,8 @@ pub fn check_pat_variant(pcx: pat_ctxt, pat: @ast::pat, path: @ast::path,
             kind_name = "variant";
         }
         ty::ty_struct(struct_def_id, ref expected_substs) => {
-            // Lookup the struct ctor def id
-            let s_def = lookup_def(pcx.fcx, pat.span, pat.id);
-            let s_def_id = ast_util::def_id_of_def(s_def);
-
             // Assign the pattern the type of the struct.
-            let ctor_tpt = ty::lookup_item_type(tcx, s_def_id);
-            let struct_tpt = if ty::is_fn_ty(ctor_tpt.ty) {
-                {ty: ty::ty_fn_ret(ctor_tpt.ty), ..ctor_tpt}
-            } else {
-                ctor_tpt
-            };
+            let struct_tpt = ty::lookup_item_type(tcx, struct_def_id);
             instantiate_path(pcx.fcx, path, struct_tpt, pat.span, pat.id,
                              pcx.block_region);
 

trunk/src/librustc/middle/typeck/check/method.rs

@@ -438,10 +438,9 @@ pub impl LookupContext {
 
                 let trait_methods = ty::trait_methods(tcx, init_trait_id);
                 let pos = {
-                    // FIXME #3453 can't use trait_methods.position
-                    match vec::position(*trait_methods,
-                                        |m| (m.self_ty != ast::sty_static &&
-                                             m.ident == self.m_name))
+                    match trait_methods.position(|m| {
+                        m.self_ty != ast::sty_static &&
+                            m.ident == self.m_name })
                     {
                         Some(pos) => pos,
                         None => {
@@ -624,9 +623,7 @@ pub impl LookupContext {
         }
 
         let idx = {
-            // FIXME #3453 can't use impl_info.methods.position
-            match vec::position(impl_info.methods,
-                                |m| m.ident == self.m_name) {
+            match impl_info.methods.position(|m| m.ident == self.m_name) {
                 Some(idx) => idx,
                 None => { return; } // No method with the right name.
             }

trunk/src/librustc/middle/typeck/check/writeback.rs

@@ -275,10 +275,6 @@ pub fn resolve_type_vars_in_fn(fcx: @mut FnCtxt,
                 |_bm, pat_id, span, _path| {
             resolve_type_vars_for_node(wbcx, span, pat_id);
         }
-        // Privacy needs the type for the whole pattern, not just each binding
-        if !pat_util::pat_is_binding(fcx.tcx().def_map, arg.pat) {
-            resolve_type_vars_for_node(wbcx, arg.pat.span, arg.pat.id);
-        }
     }
     return wbcx.success;
 }

trunk/src/librustc/middle/typeck/mod.rs

@@ -208,7 +208,7 @@ pub struct CrateCtxt {
 // Functions that write types into the node type table
 pub fn write_ty_to_tcx(tcx: ty::ctxt, node_id: ast::node_id, ty: ty::t) {
     debug!("write_ty_to_tcx(%d, %s)", node_id, ppaux::ty_to_str(tcx, ty));
-    tcx.node_types.insert(node_id as uint, ty);
+    oldsmallintmap::insert(*tcx.node_types, node_id as uint, ty);
 }
 pub fn write_substs_to_tcx(tcx: ty::ctxt,
                            node_id: ast::node_id,

trunk/src/test/compile-fail/match-struct.rs

@@ -8,15 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// regression test for issue 4875
-
-pub struct Foo<T> {
-    data: T,
-}
-
-fn foo<T>(Foo{_}: Foo<T>) {
-}
-
 pub fn main() {
+    let mut v = ~[1, 2, 3];
+    assert v.position(|x| *x == 1) == Some(0);
+    assert v.position(|x| *x == 3) == Some(2);
+    assert v.position(|x| *x == 17) == None;
 }
-