Revert "Revert "JumpToFrame refactor"" + Fix

runtime/vm/profiler.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/address_sanitizer.h"
 #include "platform/memory_sanitizer.h"
 #include "platform/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
@@ skipping 1086 matching lines @@
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   Isolate* isolate = thread->isolate();
 
   // Thread is not doing VM work.
   if (thread->task_kind() == Thread::kUnknownTask) {
     AtomicOperations::IncrementInt64By(&counters_.bail_out_unknown_task, 1);
     return;
   }
 
-  if (StubCode::HasBeenInitialized() &&
-      StubCode::InJumpToExceptionHandlerStub(state.pc)) {
-    // The JumpToExceptionHandler stub manually adjusts the stack pointer,
-    // frame pointer, and some isolate state before jumping to a catch entry.
-    // It is not safe to walk the stack when executing this stub.
+  if (StubCode::HasBeenInitialized() && StubCode::InJumpToFrameStub(state.pc)) {
+    // The JumpToFrame stub manually adjusts the stack pointer, frame
+    // pointer, and some isolate state.  It is not safe to walk the
+    // stack when executing this stub.
     AtomicOperations::IncrementInt64By(
         &counters_.bail_out_jump_to_exception_handler, 1);
     return;
   }
 
   const bool in_dart_code = thread->IsExecutingDartCode();
 
   uintptr_t sp = 0;
   uintptr_t fp = state.fp;
   uintptr_t pc = state.pc;
@@ skipping 407 matching lines @@
 
 
 ProcessedSampleBuffer::ProcessedSampleBuffer()
     : code_lookup_table_(new CodeLookupTable(Thread::Current())) {
   ASSERT(code_lookup_table_ != NULL);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart