- Simplify logic when setting up handle content.

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 4884 matching lines @@
 
 
 void Object::SetRaw(RawObject* value) {
   // NOTE: The assignment "raw_ = value" should be the first statement in
   // this function. Also do not use 'value' in this function after the
   // assignment (use 'raw_' instead).
   raw_ = value;
   if ((reinterpret_cast<uword>(raw_) & kSmiTagMask) == kSmiTag) {
     set_vtable(Smi::handle_vtable_);
     return;
+  } else if (raw_ == null_) {
+    set_vtable(handle_vtable_);
+    return;
   }
+
 #if defined(DEBUG)
   Isolate* isolate = Isolate::Current();
   Heap* isolate_heap = isolate->heap();
   Heap* vm_isolate_heap = Dart::vm_isolate()->heap();
   ASSERT(isolate_heap->Contains(reinterpret_cast<uword>(raw_->ptr())) ||
          vm_isolate_heap->Contains(reinterpret_cast<uword>(raw_->ptr())));
 #endif
-  if (raw_ == null_) {
-    set_vtable(handle_vtable_);
+  intptr_t cid = raw_->GetClassId();
+  if (cid < kNumPredefinedKinds) {
+#if defined(DEBUG)
+    ASSERT(builtin_vtables_[cid] ==
+           isolate->class_table()->At(cid)->ptr()->handle_vtable_);
+#endif
+    set_vtable(builtin_vtables_[cid]);
   } else {
-    intptr_t cid = raw_->GetClassId();
-    if (cid < kNumPredefinedKinds) {
-#if defined(DEBUG)
-      ASSERT(builtin_vtables_[cid] ==
-             isolate->class_table()->At(cid)->ptr()->handle_vtable_);
+#if !defined(DEBUG)
+    Isolate* isolate = Isolate::Current();
 #endif
-      set_vtable(builtin_vtables_[cid]);
-    } else {
-#if !defined(DEBUG)
-      Isolate* isolate = Isolate::Current();
-#endif
-      RawClass* raw_class = isolate->class_table()->At(cid);
-      set_vtable(raw_class->ptr()->handle_vtable_);
-    }
+    RawClass* raw_class = isolate->class_table()->At(cid);
+    set_vtable(raw_class->ptr()->handle_vtable_);
   }
 }
 
 
 bool Function::HasCode() const {
   return raw_ptr()->code_ != Code::null();
 }
 
 
 intptr_t Field::Offset() const {
@@ skipping 33 matching lines @@
 }
 
 
 intptr_t Stackmap::SizeInBits() const {
   return (Smi::Value(raw_ptr()->bitmap_size_in_bytes_) * kBitsPerByte);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_