rubinius · Mar 25, 2016 · Mar 25, 2016
Showing with 24 additions and 5 deletions.

+1 −1 core/vm.rb

+1 −1 machine/builtin/fiber.hpp

+4 −0 machine/builtin/location.cpp

+9 −2 machine/builtin/thread.cpp

+1 −1 machine/internal_threads.cpp

+8 −0 machine/vm.cpp
diff --git a/core/vm.rb b/core/vm.rb
@@ -9,7 +9,7 @@ def self.backtrace(frames_to_skip)
     Rubinius.primitive :vm_backtrace
 
     # Add the + 1 to skip this frame
-    backtrace(Integer(frames_to_skip) + 1, include_vars)
+    backtrace Integer(frames_to_skip) + 1
   end
 
   def self.stats

diff --git a/machine/builtin/fiber.hpp b/machine/builtin/fiber.hpp
@@ -69,7 +69,7 @@ namespace rubinius {
 
       state->vm()->set_current_fiber(this);
       state->vm()->set_call_frame(data_->call_frame());
-      data_->set_call_frame(0);
+      data_->set_call_frame(NULL);
       status_ = eRunning;
     }
 

diff --git a/machine/builtin/location.cpp b/machine/builtin/location.cpp
@@ -127,6 +127,8 @@ namespace rubinius {
   }
 
   Array* Location::from_call_stack(STATE, ssize_t up) {
+    if(up < 0) rubinius::bug("negative skip frame value provided");
+
     CallFrame* base = state->vm()->call_frame();
     CallFrame* start = base;
     size_t count = 0;
@@ -156,6 +158,8 @@ namespace rubinius {
   }
 
   Array* Location::mri_backtrace(STATE, ssize_t up) {
+    if(up < 0) rubinius::bug("negative skip frame value provided");
+
     CallFrame* base = state->vm()->call_frame();
     CallFrame* start = base;
     size_t count = 0;

diff --git a/machine/builtin/thread.cpp b/machine/builtin/thread.cpp
@@ -112,7 +112,9 @@ namespace rubinius {
   }
 
   Object* run_instance(STATE) {
-    // These are all referenced, so OnStack is not necessary.
+    /* These are all referenced, so OnStack is not necessary. Additionally,
+     * thread is pinned, so we do not need to worry about it moving.
+     */
     Thread* thread = state->vm()->thread.get();
     Array* args = thread->args();
     Object* block = thread->block();
@@ -123,6 +125,11 @@ namespace rubinius {
 
     Object* value = block->send(state, G(sym_call), args, block);
 
+    /* We explicitly set the current CallFrame reference to NULL because we
+     * are at the top of the stack in terms of managed code.
+     */
+    state->vm()->set_call_frame(NULL);
+
     thread->exception(state, state->vm()->thread_state()->current_exception());
 
     if(state->vm()->thread_state()->raise_reason() == cThreadKill) {
@@ -367,6 +374,7 @@ namespace rubinius {
 
     vm->shared.tool_broker()->thread_start(state);
     Object* value = vm->thread->function_(state);
+    vm->set_call_frame(NULL);
     vm->shared.tool_broker()->thread_stop(state);
 
     vm->thread->join_lock_.lock();
@@ -388,7 +396,6 @@ namespace rubinius {
 
     logger::write("exit thread: %s", vm->name().c_str());
 
-    vm->set_call_frame(0);
     vm->become_unmanaged();
 
     if(vm->main_thread_p() || (!value && vm->thread_state()->raise_reason() == cExit)) {

diff --git a/machine/internal_threads.cpp b/machine/internal_threads.cpp
@@ -49,7 +49,7 @@ namespace rubinius {
     RUBINIUS_THREAD_STOP(
         const_cast<RBX_DTRACE_CHAR_P>(vm->name().c_str()), vm->thread_id(), 1);
 
-    vm->set_call_frame(0);
+    vm->set_call_frame(NULL);
     vm->become_unmanaged();
 
     vm->set_zombie(state);

diff --git a/machine/vm.cpp b/machine/vm.cpp
@@ -123,6 +123,8 @@ namespace rubinius {
   }
 
   CallFrame* VM::get_call_frame(ssize_t up) {
+    if(up < 0) rubinius::bug("negative skip frame value provided");
+
     CallFrame* frame = call_frame_;
 
     while(frame && up-- > 0) {
@@ -133,6 +135,8 @@ namespace rubinius {
   }
 
   CallFrame* VM::get_ruby_frame(ssize_t up) {
+    if(up < 0) rubinius::bug("negative skip frame value provided");
+
     CallFrame* frame = call_frame_;
 
     while(frame && up-- > 0) {
@@ -148,6 +152,8 @@ namespace rubinius {
   }
 
   CallFrame* VM::get_variables_frame(ssize_t up) {
+    if(up < 0) rubinius::bug("negative skip frame value provided");
+
     CallFrame* frame = call_frame_;
 
     while(frame && up-- > 0) {
@@ -169,6 +175,8 @@ namespace rubinius {
   }
 
   CallFrame* VM::get_scope_frame(ssize_t up) {
+    if(up < 0) rubinius::bug("negative skip frame value provided");
+
     CallFrame* frame = call_frame_;
 
     while(frame && up-- > 0) {