Revert "Support ES6 Map and Set in heap profiler"

src/objects.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_OBJECTS_H_
 #define V8_OBJECTS_H_
 
 #include "src/allocation.h"
 #include "src/assert-scope.h"
 #include "src/builtins.h"
@@ skipping 26 matching lines @@
 // - Object
 //   - Smi          (immediate small integer)
 //   - HeapObject   (superclass for everything allocated in the heap)
 //     - JSReceiver  (suitable for property access)
 //       - JSObject
 //         - JSArray
 //         - JSArrayBuffer
 //         - JSArrayBufferView
 //           - JSTypedArray
 //           - JSDataView
-//         - JSCollection
-//           - JSSet
-//           - JSMap
+//         - JSSet
+//         - JSMap
 //         - JSSetIterator
 //         - JSMapIterator
 //         - JSWeakCollection
 //           - JSWeakMap
 //           - JSWeakSet
 //         - JSRegExp
 //         - JSFunction
 //         - JSGeneratorObject
 //         - JSModule
 //         - GlobalObject
@@ skipping 10012 matching lines @@
 
   typedef FixedBodyDescriptor<kHandlerOffset,
                               kConstructTrapOffset + kPointerSize,
                               kSize> BodyDescriptor;
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSFunctionProxy);
 };
 
 
-class JSCollection : public JSObject {
- public:
-  // [table]: the backing hash table
-  DECL_ACCESSORS(table, Object)
-
-  static const int kTableOffset = JSObject::kHeaderSize;
-  static const int kSize = kTableOffset + kPointerSize;
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(JSCollection);
-};
-
-
 // The JSSet describes EcmaScript Harmony sets
-class JSSet : public JSCollection {
+class JSSet: public JSObject {
  public:
+  // [set]: the backing hash set containing keys.
+  DECL_ACCESSORS(table, Object)
+
   DECLARE_CAST(JSSet)
 
   // Dispatched behavior.
   DECLARE_PRINTER(JSSet)
   DECLARE_VERIFIER(JSSet)
 
+  static const int kTableOffset = JSObject::kHeaderSize;
+  static const int kSize = kTableOffset + kPointerSize;
+
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSSet);
 };
 
 
 // The JSMap describes EcmaScript Harmony maps
-class JSMap : public JSCollection {
+class JSMap: public JSObject {
  public:
+  // [table]: the backing hash table mapping keys to values.
+  DECL_ACCESSORS(table, Object)
+
   DECLARE_CAST(JSMap)
 
   // Dispatched behavior.
   DECLARE_PRINTER(JSMap)
   DECLARE_VERIFIER(JSMap)
 
+  static const int kTableOffset = JSObject::kHeaderSize;
+  static const int kSize = kTableOffset + kPointerSize;
+
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSMap);
 };
 
 
 // OrderedHashTableIterator is an iterator that iterates over the keys and
 // values of an OrderedHashTable.
 //
 // The iterator has a reference to the underlying OrderedHashTable data,
 // [table], as well as the current [index] the iterator is at.
@@ skipping 1103 matching lines @@
     } else {
       value &= ~(1 << bit_position);
     }
     return value;
   }
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_H_