---

yaml
---
r: 477
b: refs/heads/master
c: 0f53d03
h: refs/heads/master
i:
  475: c87d3a1
v: v3

Author: Tohava

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbe8760af3b50bfa14d39406fe0eca2f2b82d8ec
+refs/heads/master: 0f53d0313912b56be77b267f98daa2569ebb37ea

trunk/.gitignore

@@ -30,8 +30,6 @@
 *.swp
 .hg/
 .hgignore
-.cproject
-.project
 lexer.ml
 rustboot
 rustc

trunk/AUTHORS.txt

@@ -15,7 +15,6 @@ Jeff Mulzelaar <[email protected]>
 Jeffrey Yasskin <[email protected]>
 Matt Brubeck <[email protected]>
 Michael Bebenita <[email protected]>
-Or Brostovski <[email protected]>
 Patrick Walton <[email protected]>
 Ralph Giles <[email protected]>
 Roy Frostig <[email protected]>

trunk/doc/rust.texi

@@ -2822,15 +2822,12 @@ x.y = z + 2;
 @c * Ref.Stmt.Spawn::               Statements creating new tasks.
 @cindex Spawn statement
 
-A @code{spawn} statement consists of keyword @code{spawn}, followed by
-an optional literal string naming the new task and then a normal
-@emph{call} statement (@pxref{Ref.Stmt.Call}).  A @code{spawn}
-statement causes the runtime to construct a new task executing the
-called function with the given name.  The called function is referred
-to as the @dfn{entry function} for the spawned task, and its arguments
-are copied from the spawning task to the spawned task before the
-spawned task begins execution.  If no explicit name is present, the
-task is implicitly named with the string of the call statement.
+A @code{spawn} statement consists of keyword @code{spawn}, followed by a
+normal @emph{call} statement (@pxref{Ref.Stmt.Call}).  A @code{spawn}
+statement causes the runtime to construct a new task executing the called
+function.  The called function is referred to as the @dfn{entry function} for
+the spawned task, and its arguments are copied from the spawning task to the
+spawned task before the spawned task begins execution.
 
 Functions taking alias-slot arguments, or returning non-nil values, cannot be
 spawned. Iterators cannot be spawned.
@@ -2846,7 +2843,6 @@ fn helper(chan[u8] out) @{
 
 let port[u8] out;
 let task p = spawn helper(chan(out));
-let task p2 = spawn "my_helper" helper(chan(out));
 // let task run, do other things.
 auto result <- out;
 

trunk/src/Makefile

@@ -245,8 +245,7 @@ BOOT_CMXS := $(BOOT_MLS:.ml=.cmx)
 BOOT_OBJS := $(BOOT_MLS:.ml=.o)
 BOOT_CMIS := $(BOOT_MLS:.ml=.cmi)
 
-RUNTIME_CS := rt/sync/sync.cpp \
-			  rt/sync/spin_lock.cpp \
+RUNTIME_CS := rt/sync/spin_lock.cpp \
               rt/sync/lock_free_queue.cpp \
               rt/sync/condition_variable.cpp \
               rt/rust.cpp \
@@ -280,8 +279,7 @@ RUNTIME_HDR := rt/globals.h \
                rt/rust_message.h \
                rt/circular_buffer.h \
                rt/util/array_list.h \
-               rt/util/hash_map.h \
-               rt/sync/sync.h
+               rt/util/hash_map.h
 
 RUNTIME_INCS := -Irt/isaac -Irt/uthash
 RUNTIME_OBJS := $(RUNTIME_CS:.cpp=$(CFG_OBJ_SUFFIX))
@@ -385,22 +383,17 @@ TASK_XFAILS := test/run-pass/acyclic-unwind.rs \
                test/run-pass/threads.rs \
                test/run-pass/yield.rs
 
-TEST_XFAILS := test/run-pass/arith-0.rs
-
 TEST_XFAILS_X86 :=  $(TASK_XFAILS) \
-					$(TEST_XFAILS) \
                     test/run-pass/arithmetic-interference.rs \
                     test/run-pass/bind-obj-ctor.rs \
                     test/run-pass/child-outlives-parent.rs \
                     test/run-pass/clone-with-exterior.rs \
                     test/run-pass/constrained-type.rs \
-                    test/run-pass/destructor-ordering.rs \
                     test/run-pass/obj-as.rs \
                     test/run-pass/vec-slice.rs \
                     test/run-pass/fn-lval.rs \
                     test/run-pass/generic-fn-infer.rs \
                     test/run-pass/generic-recursive-tag.rs \
-                    test/run-pass/int-lib.rs \
                     test/run-pass/iter-ret.rs \
                     test/run-pass/lib-deque.rs \
                     test/run-pass/lib-map.rs \
@@ -419,19 +412,16 @@ TEST_XFAILS_X86 :=  $(TASK_XFAILS) \
                     test/compile-fail/writing-through-read-alias.rs
 
 TEST_XFAILS_LLVM := $(TASK_XFAILS) \
-					$(TEST_XFAILS) \
                     $(addprefix test/run-pass/, \
-                      arith-1.rs \
                       acyclic-unwind.rs \
                       alt-pattern-simple.rs \
                       alt-tag.rs \
                       arithmetic-interference.rs \
                       argv.rs \
+                      auto-deref.rs \
                       autoderef-full-lval.rs \
                       autoderef-objfn.rs \
                       basic.rs \
-                      basic-1.rs \
-                      basic-2.rs \
                       bind-obj-ctor.rs \
                       bind-thunk.rs \
                       bind-trivial.rs \
@@ -462,6 +452,7 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
                       generic-drop-glue.rs \
                       generic-exterior-box.rs \
                       generic-fn-infer.rs \
+                      generic-fn-twice.rs \
                       generic-fn.rs \
                       generic-obj-with-derived-type.rs \
                       generic-obj.rs \
@@ -472,8 +463,7 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
                       i32-sub.rs \
                       i8-incr.rs \
                       import.rs \
-                      integral-indexing.rs \
-                      int-lib.rs \
+                      inner-module.rs \
                       iter-range.rs \
                       iter-ret.rs \
                       large-records.rs \
@@ -491,13 +481,14 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
                       mutable-alias-vec.rs \
                       mutable-vec-drop.rs \
                       mutual-recursion-group.rs \
+                      native-mod.rc \
+                      native.rc \
                       obj-as.rs \
                       obj-drop.rs \
                       obj-dtor.rs \
                       obj-recursion.rs \
                       obj-return-polytypes.rs \
                       obj-with-vec.rs \
-                      operator-associativity.rs \
                       output-slot-variants.rs \
                       pred.rs \
                       preempt.rs \
@@ -514,7 +505,6 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
                       str-append.rs \
                       str-concat.rs \
                       str-idx.rs \
-                      str-lib.rs \
                       tag.rs \
                       tail-cps.rs \
                       tail-direct.rs \
@@ -586,18 +576,10 @@ RFAIL_RS := $(wildcard test/run-fail/*.rs)
 CFAIL_RC := $(wildcard test/compile-fail/*.rc)
 CFAIL_RS := $(wildcard test/compile-fail/*.rs)
 
-ifdef CHECK_XFAILS
-TEST_RPASS_CRATES_X86 := $(filter $(TEST_XFAILS_X86), $(RPASS_RC))
-TEST_RPASS_CRATES_LLVM := $(filter $(TEST_XFAILS_LLVM), $(RPASS_RC))
-TEST_RPASS_SOURCES_X86 := $(filter $(TEST_XFAILS_X86), $(RPASS_RS))
-TEST_RPASS_SOURCES_LLVM := $(filter $(TEST_XFAILS_LLVM), $(RPASS_RS))
-else
 TEST_RPASS_CRATES_X86 := $(filter-out $(TEST_XFAILS_X86), $(RPASS_RC))
 TEST_RPASS_CRATES_LLVM := $(filter-out $(TEST_XFAILS_LLVM), $(RPASS_RC))
 TEST_RPASS_SOURCES_X86 := $(filter-out $(TEST_XFAILS_X86), $(RPASS_RS))
 TEST_RPASS_SOURCES_LLVM := $(filter-out $(TEST_XFAILS_LLVM), $(RPASS_RS))
-endif
-
 TEST_RPASS_EXTRAS := $(wildcard test/run-pass/*/*.rs)
 TEST_RPASS_EXES_X86 := \
                       $(TEST_RPASS_CRATES_X86:.rc=.x86$(CFG_EXE_SUFFIX)) \

trunk/src/boot/be/abi.ml

@@ -41,7 +41,7 @@ let box_gc_header_size = 4;;
 
 let box_gc_malloc_return_adjustment = 3;;
 
-let stk_field_valgrind_id = 0;;
+let stk_field_valgrind_id = 0 + 1;;
 let stk_field_limit = stk_field_valgrind_id + 1;;
 let stk_field_data = stk_field_limit + 1;;
 
@@ -121,8 +121,7 @@ type abi =
                              -> Common.size      (* callsz  *)
                                -> Common.nabi
                                  -> Common.fixup (* grow_task *)
-                                   -> bool       (* is_obj_fn *)
-                                     -> unit);
+                                   -> unit);
 
     abi_emit_fn_epilogue: (Il.emitter -> unit);
 

trunk/src/boot/be/il.ml

@@ -695,7 +695,7 @@ type emitter = { mutable emit_pc: int;
                  emit_target_specific: (emitter -> quad -> unit);
                  mutable emit_quads: quads;
                  emit_annotations: (int,string) Hashtbl.t;
-                 emit_size_cache: (size,operand) Hashtbl.t;
+                 emit_size_cache: ((size,operand) Hashtbl.t) Stack.t;
                  emit_node: node_id option;
                }
 
@@ -722,7 +722,7 @@ let new_emitter
     emit_target_specific = emit_target_specific;
     emit_quads = Array.create 4 badq;
     emit_annotations = Hashtbl.create 0;
-    emit_size_cache = Hashtbl.create 0;
+    emit_size_cache = Stack.create ();
     emit_node = node;
   }
 ;;
@@ -901,13 +901,6 @@ let get_element_ptr
         (string_of_cell fmt mem_cell)
 ;;
 
-let ptr_cast (cell:cell) (rty:referent_ty) : cell =
-  match cell with
-      Mem (mem, _) -> Mem (mem, rty)
-    | Reg (reg, AddrTy _) -> Reg (reg, AddrTy rty)
-    | _ -> bug () "expected address cell in Il.ptr_cast"
-;;
-
 (*
  * Local Variables:
  * fill-column: 78;