---

yaml
---
r: 63443
b: refs/heads/snap-stage3
c: 6914ff9
h: refs/heads/master
i:
  63441: 57f2c7d
  63439: 735f326
v: v3

Author: graydon

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: adff46250ed9e9b3c31da65b2997a5458e41305a
+refs/heads/snap-stage3: 6914ff9d0142a4b1e82f809ebb8de805d8319698
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/compiletest/procsrv.rs

@@ -23,7 +23,7 @@ fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
     assert!(prog.ends_with(".exe"));
     let aux_path = prog.slice(0u, prog.len() - 4u).to_owned() + ".libaux";
 
-    env = do env.map() |pair| {
+    env = do vec::map(env) |pair| {
         let (k,v) = copy *pair;
         if k == ~"PATH" { (~"PATH", v + ";" + lib_path + ";" + aux_path) }
         else { (k,v) }

branches/snap-stage3/src/librustc/lib/llvm.rs

@@ -224,50 +224,13 @@ pub type SectionIteratorRef = *SectionIterator_opaque;
 pub enum Pass_opaque {}
 pub type PassRef = *Pass_opaque;
 
-pub mod debuginfo {
-    use super::{ValueRef};
-
-    pub enum DIBuilder_opaque {}
-    pub type DIBuilderRef = *DIBuilder_opaque;
-
-    pub type DIDescriptor = ValueRef;
-    pub type DIScope = DIDescriptor;
-    pub type DILocation = DIDescriptor;
-    pub type DIFile = DIScope;
-    pub type DILexicalBlock = DIScope;
-    pub type DISubprogram = DIScope;
-    pub type DIType = DIDescriptor;
-    pub type DIBasicType = DIType;
-    pub type DIDerivedType = DIType;
-    pub type DICompositeType = DIDerivedType;
-    pub type DIVariable = DIDescriptor;
-    pub type DIArray = DIDescriptor;
-    pub type DISubrange = DIDescriptor;
-
-    pub enum DIDescriptorFlags {
-      FlagPrivate            = 1 << 0,
-      FlagProtected          = 1 << 1,
-      FlagFwdDecl            = 1 << 2,
-      FlagAppleBlock         = 1 << 3,
-      FlagBlockByrefStruct   = 1 << 4,
-      FlagVirtual            = 1 << 5,
-      FlagArtificial         = 1 << 6,
-      FlagExplicit           = 1 << 7,
-      FlagPrototyped         = 1 << 8,
-      FlagObjcClassComplete  = 1 << 9,
-      FlagObjectPointer      = 1 << 10,
-      FlagVector             = 1 << 11,
-      FlagStaticMember       = 1 << 12
-    }
-}
-
 pub mod llvm {
     use super::{AtomicBinOp, AtomicOrdering, BasicBlockRef, ExecutionEngineRef};
     use super::{Bool, BuilderRef, ContextRef, MemoryBufferRef, ModuleRef};
     use super::{ObjectFileRef, Opcode, PassManagerRef, PassManagerBuilderRef};
     use super::{SectionIteratorRef, TargetDataRef, TypeKind, TypeRef, UseRef};
-    use super::{ValueRef, PassRef};
-    use super::debuginfo::*;
+    use super::{ValueRef,PassRef};
+
     use core::libc::{c_char, c_int, c_longlong, c_ushort, c_uint, c_ulonglong};
 
     #[link_args = "-Lrustllvm -lrustllvm"]
@@ -966,12 +929,6 @@ pub mod llvm {
         #[fast_ffi]
         pub unsafe fn LLVMDeleteBasicBlock(BB: BasicBlockRef);
 
-        #[fast_ffi]
-        pub unsafe fn LLVMMoveBasicBlockAfter(BB: BasicBlockRef, MoveAfter: BasicBlockRef);
-
-        #[fast_ffi]
-        pub unsafe fn LLVMMoveBasicBlockBefore(BB: BasicBlockRef, MoveBefore: BasicBlockRef);
-
         /* Operations on instructions */
         #[fast_ffi]
         pub unsafe fn LLVMGetInstructionParent(Inst: ValueRef)
@@ -1928,164 +1885,6 @@ pub mod llvm {
                                     AlignStack: Bool, Dialect: c_uint)
                                  -> ValueRef;
 
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreate(M: ModuleRef) -> DIBuilderRef;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderDispose(Builder: DIBuilderRef);
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderFinalize(Builder: DIBuilderRef);
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateCompileUnit(
-            Builder: DIBuilderRef,
-            Lang: c_uint,
-            File: *c_char,
-            Dir: *c_char,
-            Producer: *c_char,
-            isOptimized: bool,
-            Flags: *c_char,
-            RuntimeVer: c_uint,
-            SplitName: *c_char);
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateFile(
-            Builder: DIBuilderRef,
-            Filename: *c_char,
-            Directory: *c_char) -> DIFile;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateSubroutineType(
-            Builder: DIBuilderRef,
-            File: DIFile,
-            ParameterTypes: DIArray) -> DICompositeType;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateFunction(
-            Builder: DIBuilderRef,
-            Scope: DIDescriptor,
-            Name: *c_char,
-            LinkageName: *c_char,
-            File: DIFile,
-            LineNo: c_uint,
-            Ty: DIType,
-            isLocalToUnit: bool,
-            isDefinition: bool,
-            ScopeLine: c_uint,
-            Flags: c_uint,
-            isOptimized: bool,
-            Fn: ValueRef,
-            TParam: ValueRef,
-            Decl: ValueRef) -> DISubprogram;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateBasicType(
-            Builder: DIBuilderRef,
-            Name: *c_char,
-            SizeInBits: c_ulonglong,
-            AlignInBits: c_ulonglong,
-            Encoding: c_uint) -> DIBasicType;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreatePointerType(
-            Builder: DIBuilderRef,
-            PointeeTy: DIType,
-            SizeInBits: c_ulonglong,
-            AlignInBits: c_ulonglong,
-            Name: *c_char) -> DIDerivedType;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateStructType(
-            Builder: DIBuilderRef,
-            Scope: DIDescriptor,
-            Name: *c_char,
-            File: DIFile,
-            LineNumber: c_uint,
-            SizeInBits: c_ulonglong,
-            AlignInBits: c_ulonglong,
-            Flags: c_uint,
-            DerivedFrom: DIType,
-            Elements: DIArray,
-            RunTimeLang: c_uint,
-            VTableHolder: ValueRef) -> DICompositeType;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateMemberType(
-            Builder: DIBuilderRef,
-            Scope: DIDescriptor,
-            Name: *c_char,
-            File: DIFile,
-            LineNo: c_uint,
-            SizeInBits: c_ulonglong,
-            AlignInBits: c_ulonglong,
-            OffsetInBits: c_ulonglong,
-            Flags: c_uint,
-            Ty: DIType) -> DIDerivedType;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateLexicalBlock(
-            Builder: DIBuilderRef,
-            Scope: DIDescriptor,
-            File: DIFile,
-            Line: c_uint,
-            Col: c_uint) -> DILexicalBlock;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateLocalVariable(
-            Builder: DIBuilderRef,
-            Tag: c_uint,
-            Scope: DIDescriptor,
-            Name: *c_char,
-            File: DIFile,
-            LineNo: c_uint,
-            Ty: DIType,
-            AlwaysPreserve: bool,
-            Flags: c_uint,
-            ArgNo: c_uint) -> DIVariable;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateArrayType(
-            Builder: DIBuilderRef,
-            Size: c_ulonglong,
-            AlignInBits: c_ulonglong,
-            Ty: DIType,
-            Subscripts: DIArray) -> DIType;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateVectorType(
-            Builder: DIBuilderRef,
-            Size: c_ulonglong,
-            AlignInBits: c_ulonglong,
-            Ty: DIType,
-            Subscripts: DIArray) -> DIType;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderGetOrCreateSubrange(
-            Builder: DIBuilderRef,
-            Lo: c_longlong,
-            Count: c_longlong) -> DISubrange;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderGetOrCreateArray(
-            Builder: DIBuilderRef,
-            Ptr: *DIDescriptor,
-            Count: c_uint) -> DIArray;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderInsertDeclareAtEnd(
-            Builder: DIBuilderRef,
-            Val: ValueRef,
-            VarInfo: DIVariable,
-            InsertAtEnd: BasicBlockRef) -> ValueRef;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderInsertDeclareBefore(
-            Builder: DIBuilderRef,
-            Val: ValueRef,
-            VarInfo: DIVariable,
-            InsertBefore: ValueRef) -> ValueRef;
     }
 }
 

branches/snap-stage3/src/librustc/middle/borrowck/check_loans.rs

@@ -82,7 +82,7 @@ impl<'self> CheckLoanCtxt<'self> {
         //! are issued for future scopes and thus they may have been
         //! *issued* but not yet be in effect.
 
-        for self.dfcx_loans.each_bit_on_entry(scope_id) |loan_index| {
+        for self.dfcx_loans.each_bit_on_entry_frozen(scope_id) |loan_index| {
             let loan = &self.all_loans[loan_index];
             if !op(loan) {
                 return false;
@@ -134,7 +134,7 @@ impl<'self> CheckLoanCtxt<'self> {
         //! we encounter `scope_id`.
 
         let mut result = ~[];
-        for self.dfcx_loans.each_gen_bit(scope_id) |loan_index| {
+        for self.dfcx_loans.each_gen_bit_frozen(scope_id) |loan_index| {
             result.push(loan_index);
         }
         return result;

branches/snap-stage3/src/librustc/middle/borrowck/move_data.rs

@@ -504,7 +504,7 @@ impl FlowedMoveData {
 
         let opt_loan_path_index = self.move_data.existing_move_path(loan_path);
 
-        for self.dfcx_moves.each_bit_on_entry(id) |index| {
+        for self.dfcx_moves.each_bit_on_entry_frozen(id) |index| {
             let move = &self.move_data.moves[index];
             let moved_path = move.path;
             if base_indices.contains(&moved_path) {
@@ -560,7 +560,7 @@ impl FlowedMoveData {
             }
         };
 
-        for self.dfcx_assign.each_bit_on_entry(id) |index| {
+        for self.dfcx_assign.each_bit_on_entry_frozen(id) |index| {
             let assignment = &self.move_data.var_assignments[index];
             if assignment.path == loan_path_index && !f(assignment) {
                 return false;