Hide heap methods where possible.

test/cctest/cctest.h

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 62 matching lines @@
 
 typedef v8::internal::EnumSet<CcTestExtensionIds> CcTestExtensionFlags;
 #define DEFINE_EXTENSION_FLAG(Name, Ident)                               \
   static const CcTestExtensionFlags Name(1 << Name##_ID);
   static const CcTestExtensionFlags NO_EXTENSIONS(0);
   static const CcTestExtensionFlags ALL_EXTENSIONS((1 << kMaxExtensions) - 1);
   EXTENSION_LIST(DEFINE_EXTENSION_FLAG)
 #undef DEFINE_EXTENSION_FLAG
 
 
+// Use this to expose protected methods in i::Heap.
+class TestHeap : public i::Heap {

[Michael Starzinger, 2014/04/29 13:15:09]

At first this helper class worried me, but the more I think about it, the more I
like it. Also Hannes thinks it's OK. Let's do it. :)

[Yang, 2014/04/29 13:55:13]

:)
Apparently this is covered by the C++ spec, so I think this should be safe.

+ public:
+  using i::Heap::AllocateHeapNumber;
+  using i::Heap::AllocateMap;
+  using i::Heap::AllocateJSObject;
+  using i::Heap::AllocateJSObjectFromMap;
+  using i::Heap::AllocateByteArray;
+  using i::Heap::AllocateArgumentsObject;
+  using i::Heap::CopyCode;
+  using i::Heap::InternalizeString;
+};
+
+
 class CcTest {
  public:
   typedef void (TestFunction)();
   CcTest(TestFunction* callback, const char* file, const char* name,
          const char* dependency, bool enabled, bool initialize);
   void Run();
   static CcTest* last() { return last_; }
   CcTest* prev() { return prev_; }
   const char* file() { return file_; }
   const char* name() { return name_; }
   const char* dependency() { return dependency_; }
   bool enabled() { return enabled_; }
 
   static v8::Isolate* isolate() {
     CHECK(isolate_ != NULL);
     isolate_used_ = true;
     return isolate_;
   }
 
   static i::Isolate* i_isolate() {
     return reinterpret_cast<i::Isolate*>(isolate());
   }
 
   static i::Heap* heap() {
     return i_isolate()->heap();
   }
 
+  static TestHeap* test_heap() {
+    return reinterpret_cast<TestHeap*>(i_isolate()->heap());
+  }
+
   static v8::Local<v8::Object> global() {
     return isolate()->GetCurrentContext()->Global();
   }
 
   // TODO(dcarney): Remove.
   // This must be called first in a test.
   static void InitializeVM() {
     CHECK(!isolate_used_);
     CHECK(!initialize_called_);
     initialize_called_ = true;
@@ skipping 307 matching lines @@
     CHECK_EQ(0, heap_profiler_->heap_object_map()->FindUntrackedObjects());
     heap_profiler_->StopHeapObjectsTracking();
   }
 
  private:
   i::HeapProfiler* heap_profiler_;
 };
 
 
 #endif  // ifndef CCTEST_H_