Revert "Eliminate fake-Isolate workaround from concurrent sweeper."

runtime/vm/raw_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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/atomic.h"
 #include "vm/globals.h"
@@ skipping 377 matching lines @@
     ptr()->tags_ = RememberedBit::update(false, tags);
   }
 
   bool IsDartInstance() {
     return (!IsHeapObject() || (GetClassId() >= kInstanceCid));
   }
   bool IsFreeListElement() {
     return ((GetClassId() == kFreeListElement));
   }
 
-  // Uses the class table of the current isolate, when needed.
   intptr_t Size() const {
     uword tags = ptr()->tags_;
     intptr_t result = SizeTag::decode(tags);
     if (result != 0) {
       ASSERT(result == SizeFromClass());
       return result;
     }
     result = SizeFromClass();
     ASSERT(result > SizeTag::kMaxSizeTag);
     return result;
   }
 
-  // Like above, but avoids Thread/Isolate::Current.
-  intptr_t Size(const ClassTable* class_table) const {
-    uword tags = ptr()->tags_;
-    intptr_t result = SizeTag::decode(tags);
-    if (result != 0) {
-      ASSERT(result == SizeFromClass(class_table));
-      return result;
-    }
-    result = SizeFromClass(class_table);
-    ASSERT(result > SizeTag::kMaxSizeTag);
-    return result;
-  }
-
   bool Contains(uword addr) const {
     intptr_t this_size = Size();
     uword this_addr = RawObject::ToAddr(this);
     return (addr >= this_addr) && (addr < (this_addr + this_size));
   }
 
   void Validate(Isolate* isolate) const;
   intptr_t VisitPointers(ObjectPointerVisitor* visitor);
   bool FindObject(FindObjectVisitor* visitor);
 
@@ skipping 50 matching lines @@
       BitField<intptr_t, kReservedTagPos, kReservedTagSize> {};  // NOLINT
 
   // TODO(koda): After handling tags_, return const*, like Object::raw_ptr().
   RawObject* ptr() const {
     ASSERT(IsHeapObject());
     return reinterpret_cast<RawObject*>(
         reinterpret_cast<uword>(this) - kHeapObjectTag);
   }
 
   intptr_t SizeFromClass() const;
-  intptr_t SizeFromClass(const ClassTable* class_table) const;
 
   intptr_t GetClassId() const {
     uword tags = ptr()->tags_;
     return ClassIdTag::decode(tags);
   }
 
   template<class TagBitField>
   void UpdateTagBit(bool value) {
     uword tags = ptr()->tags_;
     uword old_tags;
@@ skipping 1686 matching lines @@
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_