---

yaml
---
r: 63212
b: refs/heads/snap-stage3
c: 107e371
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 1175e94de3b6d0f6b35fd8de3599b29267f1adab
+refs/heads/snap-stage3: 107e371bf063bc7e67698814ce87fe6cbf920d9d
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/ptr.rs

@@ -161,8 +161,8 @@ pub unsafe fn copy_nonoverlapping_memory<T>(dst: *mut T, src: *const T, count: u
 }
 
 /**
- * Invokes memset on the specified pointer, setting `count` bytes of memory
- * starting at `dst` to `c`.
+ * Invokes memset on the specified pointer, setting `count * size_of::<T>()`
+ * bytes of memory starting at `dst` to `c`.
  */
 #[inline(always)]
 #[cfg(target_word_size = "32", not(stage0))]
@@ -172,8 +172,8 @@ pub unsafe fn set_memory<T>(dst: *mut T, c: u8, count: uint) {
 }
 
 /**
- * Invokes memset on the specified pointer, setting `count` bytes of memory
- * starting at `dst` to `c`.
+ * Invokes memset on the specified pointer, setting `count * size_of::<T>()`
+ * bytes of memory starting at `dst` to `c`.
  */
 #[inline(always)]
 #[cfg(target_word_size = "64", not(stage0))]

branches/snap-stage3/src/rt/rust_task.cpp

@@ -587,7 +587,6 @@ rust_task::cleanup_after_turn() {
 // stack and false otherwise.
 bool
 rust_task::new_big_stack() {
-    assert(stk);
     // If we have a cached big stack segment, use it.
     if (big_stack) {
         // Check to see if we're already on the big stack.
@@ -617,7 +616,8 @@ rust_task::new_big_stack() {
     if (big_stack->next)
         big_stack->next->prev = big_stack;
     big_stack->prev = stk;
-    stk->next = big_stack;
+    if (stk)
+        stk->next = big_stack;
 
     stk = big_stack;