[refactoring] Specify full type in ROOT_LIST

Instead of putting "Foo" as type into the list macro, and
then extending to "type*" at consumer macros, put "Foo*"
into the macro.
This is in preparation for incremental transition to ObjectPtr,
where some roots will return pointer types and others won't.
When that migration is complete, everything will be uniform
(and without "*") again.

Bug: v8:3770
Change-Id: Ib4a9900b1fc6e59f5fc924b779ed7e94dc136ad0
Reviewed-on: https://chromium-review.googlesource.com/c/1285397
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Dan Elphick <delphick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56798}

src/heap/factory-inl.h

@@ -16,10 +16,11 @@
 namespace v8 {
 namespace internal {
 
-#define ROOT_ACCESSOR(type, name, CamelName)                                   \
-  Handle<type> Factory::name() {                                               \
-    return Handle<type>(                                                       \
-        bit_cast<type**>(&isolate()->roots_table()[RootIndex::k##CamelName])); \
+// TODO(jkummerow): Drop std::remove_pointer after the migration to ObjectPtr.
+#define ROOT_ACCESSOR(Type, name, CamelName)                           \
+  Handle<std::remove_pointer<Type>::type> Factory::name() {            \
+    return Handle<std::remove_pointer<Type>::type>(bit_cast<Address*>( \
+        &isolate()->roots_table()[RootIndex::k##CamelName]));          \
   }
 ROOT_LIST(ROOT_ACCESSOR)
 #undef ROOT_ACCESSOR

src/heap/factory.h

@@ -826,7 +826,9 @@ class V8_EXPORT_PRIVATE Factory {
 
   inline Handle<String> Uint32ToString(uint32_t value, bool check_cache = true);
 
-#define ROOT_ACCESSOR(type, name, CamelName) inline Handle<type> name();
+// TODO(jkummerow): Drop std::remove_pointer after the migration to ObjectPtr.
+#define ROOT_ACCESSOR(Type, name, CamelName) \
+  inline Handle<std::remove_pointer<Type>::type> name();
   ROOT_LIST(ROOT_ACCESSOR)
 #undef ROOT_ACCESSOR
 

src/heap/heap-inl.h

@@ -55,15 +55,17 @@ HeapObject* AllocationResult::ToObjectChecked() {
   return HeapObject::cast(object_);
 }
 
-#define ROOT_ACCESSOR(type, name, CamelName)                   \
-  type* Heap::name() {                                         \
-    return type::cast(roots_table()[RootIndex::k##CamelName]); \
+// TODO(jkummerow): Drop std::remove_pointer after the migration to ObjectPtr.
+#define ROOT_ACCESSOR(Type, name, CamelName)      \
+  Type Heap::name() {                             \
+    return std::remove_pointer<Type>::type::cast( \
+        roots_table()[RootIndex::k##CamelName]);  \
   }
 MUTABLE_ROOT_LIST(ROOT_ACCESSOR)
 #undef ROOT_ACCESSOR
 
 #define ROOT_ACCESSOR(type, name, CamelName)                                   \
-  void Heap::set_##name(type* value) {                                         \
+  void Heap::set_##name(type value) {                                          \
     /* The deserializer makes use of the fact that these common roots are */   \
     /* never in new space and never on a page that is being compacted.    */   \
     DCHECK_IMPLIES(deserialization_complete(),                                 \

src/heap/heap.h

@@ -651,7 +651,7 @@ class Heap {
   V8_INLINE RootsTable& roots_table() { return isolate_data_.roots(); }
 
 // Heap root getters.
-#define ROOT_ACCESSOR(type, name, CamelName) inline type* name();
+#define ROOT_ACCESSOR(type, name, CamelName) inline type name();
   MUTABLE_ROOT_LIST(ROOT_ACCESSOR)
 #undef ROOT_ACCESSOR
 
@@ -1391,8 +1391,7 @@ class Heap {
     return 0;
   }
 
-#define ROOT_ACCESSOR(type, name, CamelName) \
-  inline void set_##name(type* value);
+#define ROOT_ACCESSOR(type, name, CamelName) inline void set_##name(type value);
   ROOT_LIST(ROOT_ACCESSOR)
 #undef ROOT_ACCESSOR
 

src/objects-definitions.h

@@ -352,9 +352,9 @@ namespace internal {
 
 // Adapts one STRUCT_LIST_GENERATOR entry to the STRUCT_MAPS_LIST entry
 #define STRUCT_MAPS_LIST_ADAPTER(V, NAME, Name, name) \
-  V(Map, name##_map, Name##Map)
+  V(Map*, name##_map, Name##Map)
 
-// Produces (Map, struct_name_map, StructNameMap) entries
+// Produces (Map*, struct_name_map, StructNameMap) entries
 #define STRUCT_MAPS_LIST(V) STRUCT_LIST_GENERATOR(STRUCT_MAPS_LIST_ADAPTER, V)
 
 //
@@ -368,7 +368,7 @@ namespace internal {
 
 // Adapts one ALLOCATION_SITE_LIST entry to the ALLOCATION_SITE_MAPS_LIST entry
 #define ALLOCATION_SITE_MAPS_LIST_ADAPTER(V, TYPE, Name, Size, name_size) \
-  V(Map, name_size##_map, Name##Size##Map)
+  V(Map*, name_size##_map, Name##Size##Map)
 
 // Produces (Map, allocation_site_name_map, AllocationSiteNameMap) entries
 #define ALLOCATION_SITE_MAPS_LIST(V) \
@@ -389,7 +389,7 @@ namespace internal {
 
 // Adapts one DATA_HANDLER_LIST entry to the DATA_HANDLER_MAPS_LIST entry.
 #define DATA_HANDLER_MAPS_LIST_ADAPTER(V, TYPE, Name, Size, name_size) \
-  V(Map, name_size##_map, Name##Size##Map)
+  V(Map*, name_size##_map, Name##Size##Map)
 
 // Produces (Map, handler_name_map, HandlerNameMap) entries
 #define DATA_HANDLER_MAPS_LIST(V) \

src/roots-inl.h

@@ -36,13 +36,16 @@ ReadOnlyRoots::ReadOnlyRoots(Heap* heap)
 ReadOnlyRoots::ReadOnlyRoots(Isolate* isolate)
     : roots_table_(isolate->roots_table()) {}
 
-#define ROOT_ACCESSOR(type, name, CamelName)                       \
-  type* ReadOnlyRoots::name() {                                    \
-    return type::cast(roots_table_[RootIndex::k##CamelName]);      \
-  }                                                                \
-  Handle<type> ReadOnlyRoots::name##_handle() {                    \
-    return Handle<type>(                                           \
-        bit_cast<type**>(&roots_table_[RootIndex::k##CamelName])); \
+// TODO(jkummerow): Drop std::remove_pointer after the migration to ObjectPtr.
+#define ROOT_ACCESSOR(Type, name, CamelName)                             \
+  Type ReadOnlyRoots::name() const {                                     \
+    return std::remove_pointer<Type>::type::cast(                        \
+        roots_table_[RootIndex::k##CamelName]);                          \
+  }                                                                      \
+  Handle<std::remove_pointer<Type>::type> ReadOnlyRoots::name##_handle() \
+      const {                                                            \
+    return Handle<std::remove_pointer<Type>::type>(                      \
+        bit_cast<Address*>(&roots_table_[RootIndex::k##CamelName]));     \
   }
 
 READ_ONLY_ROOT_LIST(ROOT_ACCESSOR)