Move sticky_error_ from isolate to thread

runtime/vm/thread.cc

 // Copyright (c) 2015, 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 "vm/thread.h"
 
 #include "vm/dart_api_state.h"
 #include "vm/growable_array.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
@@ skipping 44 matching lines @@
 #if defined(DEBUG)
       top_handle_scope_(NULL),
       no_handle_scope_depth_(0),
       no_safepoint_scope_depth_(0),
 #endif
       reusable_handles_(),
       cha_(NULL),
       deopt_id_(0),
       vm_tag_(0),
       pending_functions_(GrowableObjectArray::null()),
+      sticky_error_(Error::null()),
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_INITIALIZERS)
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_INIT)
       safepoint_state_(0),
       execution_state_(kThreadInVM),
       next_(NULL) {
 #define DEFAULT_INIT(type_name, member_name, init_expr, default_init_value)    \
   member_name = default_init_value;
 CACHED_CONSTANTS_LIST(DEFAULT_INIT)
 #undef DEFAULT_INIT
 
@@ skipping 93 matching lines @@
 
 
 RawGrowableObjectArray* Thread::pending_functions() {
   if (pending_functions_ == GrowableObjectArray::null()) {
     pending_functions_ = GrowableObjectArray::New(Heap::kOld);
   }
   return pending_functions_;
 }
 
 
+void Thread::clear_pending_functions() {
+  pending_functions_ = GrowableObjectArray::null();
+}
+
+
+RawError* Thread::sticky_error() const {
+  return sticky_error_;
+}
+
+
+void Thread::set_sticky_error(const Error& value) {
+  // TODO(asiva): Move sticky_error_ into thread specific area.
+  // ASSERT(Thread::Current()->IsMutatorThread());

[siva, 2016/02/05 22:46:36]

This TODO and ASSERT can be removed now.

[srdjan, 2016/02/05 23:34:33]

Done.

+  ASSERT(!value.IsNull());
+  sticky_error_ = value.raw();
+}
+
+
+void Thread::clear_sticky_error() {
+  sticky_error_ = Error::null();
+}
+
+
 bool Thread::EnterIsolate(Isolate* isolate) {
   const bool kIsMutatorThread = true;
   Thread* thread = isolate->ScheduleThread(kIsMutatorThread);
   if (thread != NULL) {
     ASSERT(thread->store_buffer_block_ == NULL);
     thread->StoreBufferAcquire();
     return true;
   }
   return false;
 }
@@ skipping 143 matching lines @@
 
   // Visit objects in thread specific handles area.
   reusable_handles_.VisitObjectPointers(visitor);
 
   // Visit the pending functions.
   if (pending_functions_ != GrowableObjectArray::null()) {
     visitor->VisitPointer(
         reinterpret_cast<RawObject**>(&pending_functions_));
   }
 
+  if (sticky_error_ != Error::null()) {
+    visitor->VisitPointer(
+        reinterpret_cast<RawObject**>(&sticky_error_));
+  }

[siva, 2016/02/05 22:46:36]

Why do we have these checks for NULL the visitor should work fine for null
objects too right?

[srdjan, 2016/02/05 23:34:33]

Do not remember why that was done. Removed both checks.

+
   // Visit the api local scope as it has all the api local handles.
   ApiLocalScope* scope = api_top_scope_;
   while (scope != NULL) {
     scope->local_handles()->VisitObjectPointers(visitor);
     scope = scope->previous();
   }
 }
 
 
 bool Thread::CanLoadFromThread(const Object& object) {
@@ skipping 123 matching lines @@
 
 DisableThreadInterruptsScope::~DisableThreadInterruptsScope() {
   if (thread() != NULL) {
     OSThread* os_thread = thread()->os_thread();
     ASSERT(os_thread != NULL);
     os_thread->EnableThreadInterrupts();
   }
 }
 
 }  // namespace dart