Handle-like interface for HashTable.

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 7706 matching lines @@
 typedef UnorderedHashMap<CompressedTokenTraits> CompressedTokenMap;
 
 
 // Helper class for creation of compressed token stream data.
 class CompressedTokenStreamData : public ValueObject {
  public:
   static const intptr_t kInitialBufferSize = 16 * KB;
   CompressedTokenStreamData() :
       buffer_(NULL),
       stream_(&buffer_, Reallocate, kInitialBufferSize),
-      tokens_(Array::Handle(
-          HashTables::New<CompressedTokenMap>(kInitialTableSize))) {
+      tokens_(HashTables::New<CompressedTokenMap>(kInitialTableSize)) {
   }
   ~CompressedTokenStreamData() {
     // Safe to discard the hash table now.
     tokens_.Release();
   }
 
   // Add an IDENT token into the stream and the token hash map.
   void AddIdentToken(const String* ident) {
     ASSERT(ident->IsSymbol());
     const intptr_t fresh_index = tokens_.NumOccupied();
@@ skipping 1004 matching lines @@
   }
 };
 typedef UnorderedHashMap<StringEqualsTraits> ResolvedNamesMap;
 
 
 // Returns true if the name is found in the cache, false no cache hit.
 // obj is set to the cached entry. It may be null, indicating that the
 // name does not resolve to anything in this library.
 bool Library::LookupResolvedNamesCache(const String& name,
                                        Object* obj) const {
-  ResolvedNamesMap cache(Array::Handle(resolved_names()));
+  ResolvedNamesMap cache(resolved_names());
   bool present = false;
   *obj = cache.GetOrNull(name, &present);
-  RawArray* array = cache.Release();
-  ASSERT(array == resolved_names());
+  ASSERT(cache.Release().raw() == resolved_names());
   return present;
 }
 
 
 // Add a name to the resolved name cache. This name resolves to the
 // given object in this library scope. obj may be null, which means
 // the name does not resolve to anything in this library scope.
 void Library::AddToResolvedNamesCache(const String& name,
                                       const Object& obj) const {
   if (!FLAG_use_lib_cache) {
     return;
   }
-  ResolvedNamesMap cache(Array::Handle(resolved_names()));
+  ResolvedNamesMap cache(resolved_names());
   cache.UpdateOrInsert(name, obj);
-  StorePointer(&raw_ptr()->resolved_names_, cache.Release());
+  StorePointer(&raw_ptr()->resolved_names_, cache.Release().raw());
 }
 
 
 void Library::InvalidateResolvedName(const String& name) const {
   Object& entry = Object::Handle();
   if (LookupResolvedNamesCache(name, &entry)) {
     // TODO(koda): Support deleted sentinel in snapshots and remove only 'name'.
     InvalidateResolvedNamesCache();
   }
 }
@@ skipping 9360 matching lines @@
           Integer::Cast(hash_code).AsTruncatedUint32Value());
     } else {
       return 0;
     }
   }
 };
 typedef EnumIndexHashMap<DefaultHashTraits> EnumIndexDefaultMap;
 
 
 intptr_t LinkedHashMap::Length() const {
-  EnumIndexDefaultMap map(Array::Handle(data()));
+  EnumIndexDefaultMap map(data());
   intptr_t result = map.NumOccupied();
-  {
-    RawArray* array = map.Release();
-    ASSERT(array == data());
-  }
+  ASSERT(map.Release().raw() == data());
   return result;
 }
 
 
 void LinkedHashMap::InsertOrUpdate(const Object& key,
                                      const Object& value) const {
   ASSERT(!IsNull());
-  EnumIndexDefaultMap map(Array::Handle(data()));
+  EnumIndexDefaultMap map(data());
   if (!map.UpdateOrInsert(key, value)) {
     SetModified();
   }
-  StorePointer(&raw_ptr()->data_, map.Release());
+  StorePointer(&raw_ptr()->data_, map.Release().raw());
 }
 
 
 RawObject* LinkedHashMap::LookUp(const Object& key) const {
   ASSERT(!IsNull());
-  EnumIndexDefaultMap map(Array::Handle(data()));
+  EnumIndexDefaultMap map(data());
   const Object& result = Object::Handle(map.GetOrNull(key));
-  {
-    RawArray* array = map.Release();
-    ASSERT(array == data());
-  }
+  ASSERT(map.Release().raw() == data());
   return result.raw();
 }
 
 
 bool LinkedHashMap::Contains(const Object& key) const {
   ASSERT(!IsNull());
-  EnumIndexDefaultMap map(Array::Handle(data()));
+  EnumIndexDefaultMap map(data());
   bool result = map.ContainsKey(key);
-  {
-    RawArray* array = map.Release();
-    ASSERT(array == data());
-  }
+  ASSERT(map.Release().raw() == data());
   return result;
 }
 
 
 RawObject* LinkedHashMap::Remove(const Object& key) const {
   ASSERT(!IsNull());
-  EnumIndexDefaultMap map(Array::Handle(data()));
+  EnumIndexDefaultMap map(data());
   // TODO(koda): Make 'Remove' also return the old value.
   const Object& result = Object::Handle(map.GetOrNull(key));
   if (map.Remove(key)) {
     SetModified();
   }
-  StorePointer(&raw_ptr()->data_, map.Release());
+  StorePointer(&raw_ptr()->data_, map.Release().raw());
   return result.raw();
 }
 
 
 void LinkedHashMap::Clear() const {
   ASSERT(!IsNull());
   if (Length() != 0) {
-    EnumIndexDefaultMap map(Array::Handle(data()));
+    EnumIndexDefaultMap map(data());
     map.Initialize();
     SetModified();
-    StorePointer(&raw_ptr()->data_, map.Release());
+    StorePointer(&raw_ptr()->data_, map.Release().raw());
   }
 }
 
 
 RawArray* LinkedHashMap::ToArray() const {
-  EnumIndexDefaultMap map(Array::Handle(data()));
+  EnumIndexDefaultMap map(data());
   const Array& result = Array::Handle(HashTables::ToArray(map, true));
-  RawArray* array = map.Release();
-  ASSERT(array == data());
+  ASSERT(map.Release().raw() == data());
   return result.raw();
 }
 
 
 void LinkedHashMap::SetModified() const {
   StorePointer(&raw_ptr()->cme_mark_, Instance::null());
 }
 
 
 RawInstance* LinkedHashMap::GetModificationMark(bool create) const {
@@ skipping 1107 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart