some unnecessary set_return

interpreter/code.c

@@ -290,7 +290,8 @@ void exec(Code* expr, int frame_ptr, int root_frame_ptr)
                 Thunk* target = thunk;
                 thunk = (Thunk*) alloc_heap(newsize);
                 target->desc = (Desc*) __FORWARD_PTR__;
-                target->_forward_ptr = thunk;                
+                target->_forward_ptr = thunk;
+                set_return(root_frame_ptr, thunk);
             }
 
             thunk->desc = slice;
@@ -302,7 +303,6 @@ void exec(Code* expr, int frame_ptr, int root_frame_ptr)
                         = ((AppEntry*) expr)->args[i]->create_thunk(((AppEntry*) expr)->args[i], frame_ptr);
             }
 
-            set_return(root_frame_ptr, thunk);
             destroy_stack_frame(root_frame_ptr);
             destroy_stack_frame_b(root_frame_ptr_b);
             return;                                
@@ -369,7 +369,8 @@ void exec(Code* expr, int frame_ptr, int root_frame_ptr)
                     Thunk* target = thunk;
                     thunk = (Thunk*) alloc_heap(newsize);
                     target->desc = (Desc*) __FORWARD_PTR__;
-                    target->_forward_ptr = thunk;                
+                    target->_forward_ptr = thunk;
+                    set_return(root_frame_ptr, thunk);
                 }
 
                 thunk->desc = slice;
@@ -383,7 +384,6 @@ void exec(Code* expr, int frame_ptr, int root_frame_ptr)
                             = ((AppEntry*) expr)->args[i]->create_thunk(((AppEntry*) expr)->args[i], frame_ptr);
                 }
 
-                set_return(root_frame_ptr, thunk);
                 destroy_stack_frame(root_frame_ptr);
                 destroy_stack_frame_b(root_frame_ptr_b);
                 return;                    
@@ -409,9 +409,9 @@ void exec(Code* expr, int frame_ptr, int root_frame_ptr)
             else
             {
                 forward_thunk(arg, root_frame_ptr);
+                set_return(root_frame_ptr, arg);
             }
             
-            set_return(root_frame_ptr, arg);
             destroy_stack_frame(root_frame_ptr);
             destroy_stack_frame_b(root_frame_ptr_b);            
             return;