Avoid needless calls to Isolate::Current() in RawObject::SizeFromClass.

runtime/vm/raw_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/raw_object.h"
 
 #include "vm/class_table.h"
 #include "vm/dart.h"
 #include "vm/freelist.h"
 #include "vm/isolate.h"
@@ skipping 47 matching lines @@
     return;
   }
   intptr_t size = SizeTag::decode(tags);
   if (size != 0 && size != SizeFromClass()) {
     FATAL1("Inconsistent class size encountered %" Pd "\n", size);
   }
 }
 
 
 intptr_t RawObject::SizeFromClass() const {
-  Isolate* isolate = Isolate::Current();
-  NoHandleScope no_handles(isolate);
-
   // Only reasonable to be called on heap objects.
   ASSERT(IsHeapObject());
 
   intptr_t class_id = GetClassId();
-  ClassTable* class_table = isolate->class_table();
+  intptr_t instance_size = 0;
+  switch (class_id) {
+    case kCodeCid: {
+      const RawCode* raw_code = reinterpret_cast<const RawCode*>(this);
+      intptr_t pointer_offsets_length =
+        Code::PtrOffBits::decode(raw_code->ptr()->state_bits_);

[Ivan Posva, 2015/03/19 23:19:36]

4 spaces

[koda, 2015/03/19 23:22:37]

Done.

+      instance_size = Code::InstanceSize(pointer_offsets_length);
+      break;
+    }
+    case kInstructionsCid: {
+      const RawInstructions* raw_instructions =
+          reinterpret_cast<const RawInstructions*>(this);
+      intptr_t instructions_size = raw_instructions->ptr()->size_;
+      instance_size = Instructions::InstanceSize(instructions_size);
+      break;
+    }
+    case kContextCid: {
+      const RawContext* raw_context =
+          reinterpret_cast<const RawContext*>(this);
+      intptr_t num_variables = raw_context->ptr()->num_variables_;
+      instance_size = Context::InstanceSize(num_variables);
+      break;
+    }
+    case kContextScopeCid: {
+      const RawContextScope* raw_context_scope =
+          reinterpret_cast<const RawContextScope*>(this);
+      intptr_t num_variables = raw_context_scope->ptr()->num_variables_;
+      instance_size = ContextScope::InstanceSize(num_variables);
+      break;
+    }
+    case kOneByteStringCid: {
+      const RawOneByteString* raw_string =
+          reinterpret_cast<const RawOneByteString*>(this);
+      intptr_t string_length = Smi::Value(raw_string->ptr()->length_);
+      instance_size = OneByteString::InstanceSize(string_length);
+      break;
+    }
+    case kTwoByteStringCid: {
+      const RawTwoByteString* raw_string =
+          reinterpret_cast<const RawTwoByteString*>(this);
+      intptr_t string_length = Smi::Value(raw_string->ptr()->length_);
+      instance_size = TwoByteString::InstanceSize(string_length);
+      break;
+    }
+    case kArrayCid:
+    case kImmutableArrayCid: {
+      const RawArray* raw_array = reinterpret_cast<const RawArray*>(this);
+      intptr_t array_length = Smi::Value(raw_array->ptr()->length_);
+      instance_size = Array::InstanceSize(array_length);
+      break;
+    }
+#define SIZE_FROM_CLASS(clazz)                                                 \
+    case kTypedData##clazz##Cid:
+    CLASS_LIST_TYPED_DATA(SIZE_FROM_CLASS) {
+      const RawTypedData* raw_obj =
+          reinterpret_cast<const RawTypedData*>(this);
+      intptr_t cid = raw_obj->GetClassId();
+      intptr_t array_len = Smi::Value(raw_obj->ptr()->length_);
+      intptr_t lengthInBytes = array_len * TypedData::ElementSizeInBytes(cid);
+      instance_size = TypedData::InstanceSize(lengthInBytes);
+      break;
+    }
+#undef SIZE_FROM_CLASS
+    case kTypeArgumentsCid: {
+      const RawTypeArguments* raw_array =
+          reinterpret_cast<const RawTypeArguments*>(this);
+      intptr_t array_length = Smi::Value(raw_array->ptr()->length_);
+      instance_size = TypeArguments::InstanceSize(array_length);
+      break;
+    }
+    case kPcDescriptorsCid: {
+      const RawPcDescriptors* raw_descriptors =
+          reinterpret_cast<const RawPcDescriptors*>(this);
+      const intptr_t num_descriptors = raw_descriptors->ptr()->length_;
+      const intptr_t rec_size_in_bytes =
+          raw_descriptors->ptr()->record_size_in_bytes_;
+      instance_size = PcDescriptors::InstanceSize(num_descriptors,
+                                                  rec_size_in_bytes);
+      break;
+    }
+    case kStackmapCid: {
+      const RawStackmap* map = reinterpret_cast<const RawStackmap*>(this);
+      intptr_t length = map->ptr()->length_;
+      instance_size = Stackmap::InstanceSize(length);
+      break;
+    }
+    case kLocalVarDescriptorsCid: {
+      const RawLocalVarDescriptors* raw_descriptors =
+          reinterpret_cast<const RawLocalVarDescriptors*>(this);
+      intptr_t num_descriptors = raw_descriptors->ptr()->num_entries_;
+      instance_size = LocalVarDescriptors::InstanceSize(num_descriptors);
+      break;
+    }
+    case kExceptionHandlersCid: {
+      const RawExceptionHandlers* raw_handlers =
+          reinterpret_cast<const RawExceptionHandlers*>(this);
+      intptr_t num_handlers = raw_handlers->ptr()->num_entries_;
+      instance_size = ExceptionHandlers::InstanceSize(num_handlers);
+      break;
+    }
+    case kDeoptInfoCid: {
+      const RawDeoptInfo* raw_deopt_info =
+          reinterpret_cast<const RawDeoptInfo*>(this);
+      intptr_t num_entries = Smi::Value(raw_deopt_info->ptr()->length_);
+      instance_size = DeoptInfo::InstanceSize(num_entries);
+      break;
+    }
+    case kJSRegExpCid: {
+      const RawJSRegExp* raw_jsregexp =
+          reinterpret_cast<const RawJSRegExp*>(this);
+      intptr_t data_length = Smi::Value(raw_jsregexp->ptr()->data_length_);
+      instance_size = JSRegExp::InstanceSize(data_length);
+      break;
+    }
+    case kFreeListElement: {
+      uword addr = RawObject::ToAddr(const_cast<RawObject*>(this));
+      FreeListElement* element = reinterpret_cast<FreeListElement*>(addr);
+      instance_size = element->Size();
+      break;
+    }
+    default: {
+      // Get the (constant) instance size out of the class object.
+      // TODO(koda): Add Size(ClassTable*) interface to allow caching in loops.
+      Isolate* isolate = Isolate::Current();
+      ClassTable* class_table = isolate->class_table();
 #if defined(DEBUG)
-  if (!class_table->IsValidIndex(class_id) ||
-      !class_table->HasValidClassAt(class_id)) {
-    FATAL2("Invalid class id: %" Pd " from tags %" Px "\n",
-           class_id, ptr()->tags_);
-  }
+      if (!class_table->IsValidIndex(class_id) ||
+          !class_table->HasValidClassAt(class_id)) {
+        FATAL2("Invalid class id: %" Pd " from tags %" Px "\n",
+               class_id, ptr()->tags_);
+      }
 #endif  // DEBUG
-  RawClass* raw_class = class_table->At(class_id);
-  ASSERT(raw_class->ptr()->id_ == class_id);
-
-  // Get the instance size out of the class.
-  intptr_t instance_size =
-      raw_class->ptr()->instance_size_in_words_ << kWordSizeLog2;
-
-  if (instance_size == 0) {
-    switch (class_id) {
-      case kCodeCid: {
-        const RawCode* raw_code = reinterpret_cast<const RawCode*>(this);
-        intptr_t pointer_offsets_length =
-            Code::PtrOffBits::decode(raw_code->ptr()->state_bits_);
-        instance_size = Code::InstanceSize(pointer_offsets_length);
-        break;
-      }
-      case kInstructionsCid: {
-        const RawInstructions* raw_instructions =
-            reinterpret_cast<const RawInstructions*>(this);
-        intptr_t instructions_size = raw_instructions->ptr()->size_;
-        instance_size = Instructions::InstanceSize(instructions_size);
-        break;
-      }
-      case kContextCid: {
-        const RawContext* raw_context =
-            reinterpret_cast<const RawContext*>(this);
-        intptr_t num_variables = raw_context->ptr()->num_variables_;
-        instance_size = Context::InstanceSize(num_variables);
-        break;
-      }
-      case kContextScopeCid: {
-        const RawContextScope* raw_context_scope =
-            reinterpret_cast<const RawContextScope*>(this);
-        intptr_t num_variables = raw_context_scope->ptr()->num_variables_;
-        instance_size = ContextScope::InstanceSize(num_variables);
-        break;
-      }
-      case kOneByteStringCid: {
-        const RawOneByteString* raw_string =
-            reinterpret_cast<const RawOneByteString*>(this);
-        intptr_t string_length = Smi::Value(raw_string->ptr()->length_);
-        instance_size = OneByteString::InstanceSize(string_length);
-        break;
-      }
-      case kTwoByteStringCid: {
-        const RawTwoByteString* raw_string =
-            reinterpret_cast<const RawTwoByteString*>(this);
-        intptr_t string_length = Smi::Value(raw_string->ptr()->length_);
-        instance_size = TwoByteString::InstanceSize(string_length);
-        break;
-      }
-      case kArrayCid:
-      case kImmutableArrayCid: {
-        const RawArray* raw_array = reinterpret_cast<const RawArray*>(this);
-        intptr_t array_length = Smi::Value(raw_array->ptr()->length_);
-        instance_size = Array::InstanceSize(array_length);
-        break;
-      }
-#define SIZE_FROM_CLASS(clazz)                                                 \
-      case kTypedData##clazz##Cid:
-      CLASS_LIST_TYPED_DATA(SIZE_FROM_CLASS) {
-        const RawTypedData* raw_obj =
-            reinterpret_cast<const RawTypedData*>(this);
-        intptr_t cid = raw_obj->GetClassId();
-        intptr_t array_len = Smi::Value(raw_obj->ptr()->length_);
-        intptr_t lengthInBytes = array_len * TypedData::ElementSizeInBytes(cid);
-        instance_size = TypedData::InstanceSize(lengthInBytes);
-        break;
-      }
-#undef SIZE_FROM_CLASS
-      case kTypeArgumentsCid: {
-        const RawTypeArguments* raw_array =
-            reinterpret_cast<const RawTypeArguments*>(this);
-        intptr_t array_length = Smi::Value(raw_array->ptr()->length_);
-        instance_size = TypeArguments::InstanceSize(array_length);
-        break;
-      }
-      case kPcDescriptorsCid: {
-        const RawPcDescriptors* raw_descriptors =
-            reinterpret_cast<const RawPcDescriptors*>(this);
-        const intptr_t num_descriptors = raw_descriptors->ptr()->length_;
-        const intptr_t rec_size_in_bytes =
-            raw_descriptors->ptr()->record_size_in_bytes_;
-        instance_size = PcDescriptors::InstanceSize(num_descriptors,
-                                                    rec_size_in_bytes);
-        break;
-      }
-      case kStackmapCid: {
-        const RawStackmap* map = reinterpret_cast<const RawStackmap*>(this);
-        intptr_t length = map->ptr()->length_;
-        instance_size = Stackmap::InstanceSize(length);
-        break;
-      }
-      case kLocalVarDescriptorsCid: {
-        const RawLocalVarDescriptors* raw_descriptors =
-            reinterpret_cast<const RawLocalVarDescriptors*>(this);
-        intptr_t num_descriptors = raw_descriptors->ptr()->num_entries_;
-        instance_size = LocalVarDescriptors::InstanceSize(num_descriptors);
-        break;
-      }
-      case kExceptionHandlersCid: {
-        const RawExceptionHandlers* raw_handlers =
-            reinterpret_cast<const RawExceptionHandlers*>(this);
-        intptr_t num_handlers = raw_handlers->ptr()->num_entries_;
-        instance_size = ExceptionHandlers::InstanceSize(num_handlers);
-        break;
-      }
-      case kDeoptInfoCid: {
-        const RawDeoptInfo* raw_deopt_info =
-            reinterpret_cast<const RawDeoptInfo*>(this);
-        intptr_t num_entries = Smi::Value(raw_deopt_info->ptr()->length_);
-        instance_size = DeoptInfo::InstanceSize(num_entries);
-        break;
-      }
-      case kJSRegExpCid: {
-        const RawJSRegExp* raw_jsregexp =
-            reinterpret_cast<const RawJSRegExp*>(this);
-        intptr_t data_length = Smi::Value(raw_jsregexp->ptr()->data_length_);
-        instance_size = JSRegExp::InstanceSize(data_length);
-        break;
-      }
-      case kFreeListElement: {
-        uword addr = RawObject::ToAddr(const_cast<RawObject*>(this));
-        FreeListElement* element = reinterpret_cast<FreeListElement*>(addr);
-        instance_size = element->Size();
-        break;
-      }
-      default:
-        UNREACHABLE();
-        break;
+      RawClass* raw_class = class_table->At(class_id);
+      ASSERT(raw_class->ptr()->id_ == class_id);
+      instance_size =
+          raw_class->ptr()->instance_size_in_words_ << kWordSizeLog2;
     }
   }
   ASSERT(instance_size != 0);
 #if defined(DEBUG)
   uword tags = ptr()->tags_;
   intptr_t tags_size = SizeTag::decode(tags);
   if ((class_id == kArrayCid) && (instance_size > tags_size && tags_size > 0)) {
     // TODO(22501): Array::MakeArray could be in the process of shrinking
     // the array (see comment therein), having already updated the tags but not
     // yet set the new length. Wait a millisecond and try again.
@@ skipping 713 matching lines @@
 intptr_t RawUserTag::VisitUserTagPointers(
     RawUserTag* raw_obj, ObjectPointerVisitor* visitor) {
   // Make sure that we got here with the tagged pointer as this.
   ASSERT(raw_obj->IsHeapObject());
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return UserTag::InstanceSize();
 }
 
 
 }  // namespace dart