Refactor Isolate -> Thread in NativeArguments and exception handler jump.

runtime/vm/object.cc

 // Copyright (c) 2012, 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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 1669 matching lines @@
     }
   }
 #endif
 }
 
 
 RawObject* Object::Allocate(intptr_t cls_id,
                             intptr_t size,
                             Heap::Space space) {
   ASSERT(Utils::IsAligned(size, kObjectAlignment));
-  Isolate* isolate = Isolate::Current();
+  Thread* thread = Thread::Current();
+  Isolate* isolate = thread->isolate();
   ASSERT(isolate->no_callback_scope_depth() == 0);
   Heap* heap = isolate->heap();
 
   uword address = heap->Allocate(size, space);
   if (address == 0) {
     // Use the preallocated out of memory exception to avoid calling
     // into dart code or allocating any code.
     const Instance& exception =
         Instance::Handle(isolate->object_store()->out_of_memory());
-    Exceptions::Throw(isolate, exception);
+    Exceptions::Throw(thread, exception);
     UNREACHABLE();
   }
   if (space == Heap::kNew) {
     isolate->class_table()->UpdateAllocatedNew(cls_id, size);
   } else {
     isolate->class_table()->UpdateAllocatedOld(cls_id, size);
   }
   NoSafepointScope no_safepoint;
   InitializeObject(address, cls_id, size);
   RawObject* raw_obj = reinterpret_cast<RawObject*>(address + kHeapObjectTag);
@@ skipping 15582 matching lines @@
 
 
 const char* Bigint::ToDecCString(uword (*allocator)(intptr_t size)) const {
   // log10(2) ~= 0.30102999566398114.
   const intptr_t kLog2Dividend = 30103;
   const intptr_t kLog2Divisor = 100000;
   intptr_t used = Used();
   const intptr_t kMaxUsed =
       kIntptrMax / kBitsPerDigit / kLog2Dividend * kLog2Divisor;
   if (used > kMaxUsed) {
-    // Throw out of memory exception.
-    Isolate* isolate = Isolate::Current();
-    const Instance& exception =
-        Instance::Handle(isolate->object_store()->out_of_memory());
-    Exceptions::Throw(isolate, exception);
+    Exceptions::ThrowOOM();
     UNREACHABLE();
   }
   const int64_t bit_len = used * kBitsPerDigit;
   const int64_t dec_len = (bit_len * kLog2Dividend / kLog2Divisor) + 1;
   // Add one byte for the minus sign and for the trailing \0 character.
   const int64_t len = (Neg() ? 1 : 0) + dec_len + 1;
   char* chars = reinterpret_cast<char*>(allocator(len));
   intptr_t pos = 0;
   const intptr_t kDivisor = 100000000;
   const intptr_t kDigits = 8;
@@ skipping 57 matching lines @@
     const char* zero = "0x0";
     const size_t len = strlen(zero) + 1;
     char* chars = reinterpret_cast<char*>(allocator(len));
     strncpy(chars, zero, len);
     return chars;
   }
   const int kBitsPerHexDigit = 4;
   const int kHexDigitsPerDigit = 8;
   const intptr_t kMaxUsed = (kIntptrMax - 4) / kHexDigitsPerDigit;
   if (used > kMaxUsed) {
-    // Throw out of memory exception.
-    Isolate* isolate = Isolate::Current();
-    const Instance& exception =
-        Instance::Handle(isolate->object_store()->out_of_memory());
-    Exceptions::Throw(isolate, exception);
+    Exceptions::ThrowOOM();
     UNREACHABLE();
   }
   intptr_t hex_len = (used - 1) * kHexDigitsPerDigit;
   // The most significant digit may use fewer than kHexDigitsPerDigit digits.
   uint32_t digit = DigitAt(used - 1);
   ASSERT(digit != 0);  // Value must be clamped.
   while (digit != 0) {
     hex_len++;
     digit >>= kBitsPerHexDigit;
   }
@@ skipping 752 matching lines @@
   ASSERT(start >= 0);
   ASSERT(end <= strings.Length());
   intptr_t result_len = 0;
   String& str = String::Handle();
   intptr_t char_size = kOneByteChar;
   // Compute 'char_size' and 'result_len'.
   for (intptr_t i = start; i < end; i++) {
     str ^= strings.At(i);
     const intptr_t str_len = str.Length();
     if ((kMaxElements - result_len) < str_len) {
-      Isolate* isolate = Isolate::Current();
-      const Instance& exception =
-          Instance::Handle(isolate->object_store()->out_of_memory());
-      Exceptions::Throw(isolate, exception);
+      Exceptions::ThrowOOM();
       UNREACHABLE();
     }
     result_len += str_len;
     char_size = Utils::Maximum(char_size, str.CharSize());
   }
   if (char_size == kOneByteChar) {
     return OneByteString::ConcatAll(strings, start, end, result_len, space);
   }
   ASSERT(char_size == kTwoByteChar);
   return TwoByteString::ConcatAll(strings, start, end, result_len, space);
@@ skipping 1243 matching lines @@
   return reinterpret_cast<RawImmutableArray*>(Array::New(kClassId, len, space));
 }
 
 
 void GrowableObjectArray::Add(const Object& value, Heap::Space space) const {
   ASSERT(!IsNull());
   if (Length() == Capacity()) {
     // TODO(Issue 2500): Need a better growth strategy.
     intptr_t new_capacity = (Capacity() == 0) ? 4 : Capacity() * 2;
     if (new_capacity <= Capacity()) {
-      // Use the preallocated out of memory exception to avoid calling
-      // into dart code or allocating any code.
-      Isolate* isolate = Isolate::Current();
-      const Instance& exception =
-          Instance::Handle(isolate->object_store()->out_of_memory());
-      Exceptions::Throw(isolate, exception);
+      Exceptions::ThrowOOM();
       UNREACHABLE();
     }
     Grow(new_capacity, space);
   }
   ASSERT(Length() < Capacity());
   intptr_t index = Length();
   SetLength(index + 1);
   SetAt(index, value);
 }
 
@@ skipping 1356 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart