[turbofan] Cleanup heap broker a little.

R=jarin@chromium.org

Bug: v8:7790
Change-Id: Ic1b1d47a655972d2b2f6264550db4fa5898fa46e
Reviewed-on: https://chromium-review.googlesource.com/1128871Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54339}

src/compiler/js-heap-broker.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "src/compiler/js-heap-broker.h"
+
 #include "src/compiler/compilation-dependencies.h"
 #include "src/objects-inl.h"
 #include "src/objects/js-regexp-inl.h"
@@ -11,33 +12,12 @@ namespace v8 {
 namespace internal {
 namespace compiler {
 
-HeapObjectRef::HeapObjectRef(Handle<Object> object) : ObjectRef(object) {
-  AllowHandleDereference handle_dereference;
-  DCHECK(object->IsHeapObject());
-}
-
 MapRef HeapObjectRef::map(const JSHeapBroker* broker) const {
   AllowHandleAllocation handle_allocation;
   AllowHandleDereference allow_handle_dereference;
   return MapRef(handle(object<HeapObject>()->map(), broker->isolate()));
 }
 
-JSFunctionRef::JSFunctionRef(Handle<Object> object) : JSObjectRef(object) {
-  AllowHandleDereference handle_dereference;
-  DCHECK(object->IsJSFunction());
-}
-
-HeapNumberRef::HeapNumberRef(Handle<Object> object) : HeapObjectRef(object) {
-  AllowHandleDereference handle_dereference;
-  DCHECK(object->IsHeapNumber());
-}
-
-MutableHeapNumberRef::MutableHeapNumberRef(Handle<Object> object)
-    : HeapObjectRef(object) {
-  AllowHandleDereference handle_dereference;
-  DCHECK(object->IsMutableHeapNumber());
-}
-
 double HeapNumberRef::value() const {
   AllowHandleDereference allow_handle_dereference;
   return object<HeapNumber>()->value();
@@ -48,16 +28,6 @@ double MutableHeapNumberRef::value() const {
   return object<MutableHeapNumber>()->value();
 }
 
-ContextRef::ContextRef(Handle<Object> object) : HeapObjectRef(object) {
-  AllowHandleDereference handle_dereference;
-  DCHECK(object->IsContext());
-}
-
-NativeContextRef::NativeContextRef(Handle<Object> object) : ContextRef(object) {
-  AllowHandleDereference handle_dereference;
-  DCHECK(object->IsNativeContext());
-}
-
 bool ObjectRef::IsSmi() const {
   AllowHandleDereference allow_handle_dereference;
   return object_->IsSmi();
@@ -129,21 +99,17 @@ base::Optional<int> JSHeapBroker::TryGetSmi(Handle<Object> object) {
   return Smi::cast(*object)->value();
 }
 
-#define HEAP_KIND_FUNCTIONS_DEF(Name)                \
+#define DEFINE_IS_AND_AS(Name)                       \
   bool ObjectRef::Is##Name() const {                 \
     AllowHandleDereference allow_handle_dereference; \
     return object<Object>()->Is##Name();             \
+  }                                                  \
+  Name##Ref ObjectRef::As##Name() const {            \
+    DCHECK(Is##Name());                              \
+    return Name##Ref(object<HeapObject>());          \
   }
-HEAP_BROKER_KIND_LIST(HEAP_KIND_FUNCTIONS_DEF)
-#undef HEAP_KIND_FUNCTIONS_DEF
-
-#define HEAP_DATA_FUNCTIONS_DEF(Name)       \
-  Name##Ref ObjectRef::As##Name() const {   \
-    DCHECK(Is##Name());                     \
-    return Name##Ref(object<HeapObject>()); \
-  }
-HEAP_BROKER_DATA_LIST(HEAP_DATA_FUNCTIONS_DEF)
-#undef HEAP_DATA_FUNCTIONS_DEF
+HEAP_BROKER_OBJECT_LIST(DEFINE_IS_AND_AS)
+#undef DEFINE_IS_AND_AS
 
 HeapObjectType HeapObjectRef::type(const JSHeapBroker* broker) const {
   AllowHandleDereference allow_handle_dereference;
@@ -207,17 +173,6 @@ MapRef JSFunctionRef::initial_map(const JSHeapBroker* broker) const {
   return MapRef(handle(object<JSFunction>()->initial_map(), broker->isolate()));
 }
 
-NameRef::NameRef(Handle<Object> object) : HeapObjectRef(object) {
-  AllowHandleDereference handle_dereference;
-  DCHECK(object->IsName());
-}
-
-ScriptContextTableRef::ScriptContextTableRef(Handle<Object> object)
-    : HeapObjectRef(object) {
-  AllowHandleDereference handle_dereference;
-  DCHECK(object->IsScriptContextTable());
-}
-
 base::Optional<ScriptContextTableRef::LookupResult>
 ScriptContextTableRef::lookup(const NameRef& name) const {
   AllowHandleDereference handle_dereference;
@@ -372,7 +327,7 @@ const int kMaxFastLiteralProperties = JSObject::kMaxInObjectProperties;
 // Determines whether the given array or object literal boilerplate satisfies
 // all limits to be considered for fast deep-copying and computes the total
 // size of all objects that are part of the graph.
-bool AllocationSiteRef::IsFastLiteral(const JSHeapBroker* broker) {
+bool AllocationSiteRef::IsFastLiteral(const JSHeapBroker* broker) const {
   AllowHandleDereference allow_handle_dereference;
   int max_properties = kMaxFastLiteralProperties;
   Handle<JSObject> boilerplate(object<AllocationSite>()->boilerplate(),