From 301f9001c01ffbca89241dcd8c0c2f1ae6928dfd Mon Sep 17 00:00:00 2001 From: Ron Dahlgren Date: Tue, 11 Jun 2013 10:11:49 -0700 Subject: [PATCH] Assert stk rather than checking null Given that a big stack is never requested before allocating an initial stack segment, having a non-null stk member here is an invariant. --- src/rt/rust_task.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index c521feae72f22..befcf1499363f 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. @@ -612,12 +613,11 @@ rust_task::new_big_stack() { } big_stack->task = this; - big_stack->next = stk ? stk->next : NULL; + big_stack->next = stk->next; 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;