Merge remote-tracking branch 'upstream/io' into io

Conflicts:
	src/libstd/rt/uvio.rs

1 files changed, 2 insertions, 2 deletions

diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index b5ecb166175..f9b588b7850 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -587,6 +587,7 @@ 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.
@@ -616,8 +617,7 @@ rust_task::new_big_stack() {
     if (big_stack->next)
         big_stack->next->prev = big_stack;
     big_stack->prev = stk;
-    if (stk)
-        stk->next = big_stack;
+    stk->next = big_stack;
 
     stk = big_stack;