[vm/compiler] Make UnlinkedCall inherit common members from CallSiteDataLayout

Change-Id: I5bf162eeb93d6eac922e8a32df5f9ef9b9539110
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152849
Commit-Queue: Martin Kustermann <[email protected]>
Reviewed-by: Alexander Aprelev <[email protected]>
Reviewed-by: Ryan Macnak <[email protected]>

Author: mkustermann

runtime/vm/compiler/aot/precompiler.cc

@@ -716,7 +716,7 @@ void Precompiler::AddCalleesOfHelper(const Object& entry,
     if (temp_selector->raw() == Symbols::Call().raw()) {
       // Potential closure call.
       const Array& arguments_descriptor =
-          Array::Handle(Z, call_site.args_descriptor());
+          Array::Handle(Z, call_site.arguments_descriptor());
       AddClosureCall(arguments_descriptor);
     }
   } else if (entry.IsMegamorphicCache()) {

runtime/vm/object.cc

@@ -14348,14 +14348,6 @@ SingleTargetCachePtr SingleTargetCache::New() {
   return result.raw();
 }
 
-void UnlinkedCall::set_target_name(const String& value) const {
-  StorePointer(&raw_ptr()->target_name_, value.raw());
-}
-
-void UnlinkedCall::set_args_descriptor(const Array& value) const {
-  StorePointer(&raw_ptr()->args_descriptor_, value.raw());
-}
-
 void UnlinkedCall::set_can_patch_to_monomorphic(bool value) const {
   StoreNonPointer(&raw_ptr()->can_patch_to_monomorphic_, value);
 }
@@ -14366,7 +14358,7 @@ intptr_t UnlinkedCall::Hashcode() const {
 
 bool UnlinkedCall::Equals(const UnlinkedCall& other) const {
   return (target_name() == other.target_name()) &&
-         (args_descriptor() == other.args_descriptor()) &&
+         (arguments_descriptor() == other.arguments_descriptor()) &&
          (can_patch_to_monomorphic() == other.can_patch_to_monomorphic());
 }
 
@@ -15311,7 +15303,7 @@ UnlinkedCallPtr ICData::AsUnlinkedCall() const {
   ASSERT(!is_tracking_exactness());
   const UnlinkedCall& result = UnlinkedCall::Handle(UnlinkedCall::New());
   result.set_target_name(String::Handle(target_name()));
-  result.set_args_descriptor(Array::Handle(arguments_descriptor()));
+  result.set_arguments_descriptor(Array::Handle(arguments_descriptor()));
   result.set_can_patch_to_monomorphic(!FLAG_precompiled_mode ||
                                       receiver_cannot_be_smi());
   return result.raw();

runtime/vm/object.h

@@ -1919,36 +1919,9 @@ class MonomorphicSmiableCall : public Object {
   friend class Class;
 };
 
-class UnlinkedCall : public Object {
- public:
-  StringPtr target_name() const { return raw_ptr()->target_name_; }
-  void set_target_name(const String& target_name) const;
-  ArrayPtr args_descriptor() const { return raw_ptr()->args_descriptor_; }
-  void set_args_descriptor(const Array& args_descriptor) const;
-
-  bool can_patch_to_monomorphic() const {
-    return raw_ptr()->can_patch_to_monomorphic_;
-  }
-  void set_can_patch_to_monomorphic(bool value) const;
-
-  static intptr_t InstanceSize() {
-    return RoundedAllocationSize(sizeof(UnlinkedCallLayout));
-  }
-
-  intptr_t Hashcode() const;
-  bool Equals(const UnlinkedCall& other) const;
-
-  static UnlinkedCallPtr New();
-
- private:
-  FINAL_HEAP_OBJECT_IMPLEMENTATION(UnlinkedCall, Object);
-  friend class Class;
-};
-
 class CallSiteData : public Object {
  public:
   StringPtr target_name() const { return raw_ptr()->target_name_; }
-
   ArrayPtr arguments_descriptor() const { return raw_ptr()->args_descriptor_; }
 
   static intptr_t target_name_offset() {
@@ -1961,7 +1934,6 @@ class CallSiteData : public Object {
 
  private:
   void set_target_name(const String& value) const;
-
   void set_arguments_descriptor(const Array& value) const;
 
   HEAP_OBJECT_IMPLEMENTATION(CallSiteData, Object)
@@ -1970,6 +1942,30 @@ class CallSiteData : public Object {
   friend class MegamorphicCache;
 };
 
+class UnlinkedCall : public CallSiteData {
+ public:
+  bool can_patch_to_monomorphic() const {
+    return raw_ptr()->can_patch_to_monomorphic_;
+  }
+
+  static intptr_t InstanceSize() {
+    return RoundedAllocationSize(sizeof(UnlinkedCallLayout));
+  }
+
+  intptr_t Hashcode() const;
+  bool Equals(const UnlinkedCall& other) const;
+
+  static UnlinkedCallPtr New();
+
+ private:
+  friend class ICData;  // For set_*() methods.
+
+  void set_can_patch_to_monomorphic(bool value) const;
+
+  FINAL_HEAP_OBJECT_IMPLEMENTATION(UnlinkedCall, CallSiteData);
+  friend class Class;
+};
+
 // Object holding information about an IC: test classes and their
 // corresponding targets. The owner of the ICData can be either the function
 // or the original ICData object. In case of background compilation we

runtime/vm/object_service.cc

@@ -810,7 +810,8 @@ void UnlinkedCall::PrintJSONImpl(JSONStream* stream, bool ref) const {
   if (ref) {
     return;
   }
-  jsobj.AddProperty("_argumentsDescriptor", Array::Handle(args_descriptor()));
+  jsobj.AddProperty("_argumentsDescriptor",
+                    Array::Handle(arguments_descriptor()));
 }
 
 void MonomorphicSmiableCall::PrintJSONImpl(JSONStream* stream, bool ref) const {

runtime/vm/raw_object.h

@@ -1979,16 +1979,6 @@ class SingleTargetCacheLayout : public ObjectLayout {
   classid_t upper_limit_;
 };
 
-class UnlinkedCallLayout : public ObjectLayout {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(UnlinkedCall);
-  VISIT_FROM(ObjectPtr, target_name_);
-  StringPtr target_name_;
-  ArrayPtr args_descriptor_;
-  VISIT_TO(ObjectPtr, args_descriptor_);
-  bool can_patch_to_monomorphic_;
-  ObjectPtr* to_snapshot(Snapshot::Kind kind) { return to(); }
-};
-
 class MonomorphicSmiableCallLayout : public ObjectLayout {
   RAW_HEAP_OBJECT_IMPLEMENTATION(MonomorphicSmiableCall);
   VISIT_FROM(ObjectPtr, target_);
@@ -2010,6 +2000,15 @@ class CallSiteDataLayout : public ObjectLayout {
   RAW_HEAP_OBJECT_IMPLEMENTATION(CallSiteData)
 };
 
+class UnlinkedCallLayout : public CallSiteDataLayout {
+  RAW_HEAP_OBJECT_IMPLEMENTATION(UnlinkedCall);
+  VISIT_FROM(ObjectPtr, target_name_);
+  VISIT_TO(ObjectPtr, args_descriptor_);
+  ObjectPtr* to_snapshot(Snapshot::Kind kind) { return to(); }
+
+  bool can_patch_to_monomorphic_;
+};
+
 class ICDataLayout : public CallSiteDataLayout {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ICData);
   VISIT_FROM(ObjectPtr, target_name_);

runtime/vm/runtime_entry.cc

@@ -1616,7 +1616,8 @@ class SwitchableCallHandler {
 void SwitchableCallHandler::DoUnlinkedCall(const UnlinkedCall& unlinked,
                                            const Function& target_function) {
   const String& name = String::Handle(zone_, unlinked.target_name());
-  const Array& descriptor = Array::Handle(zone_, unlinked.args_descriptor());
+  const Array& descriptor =
+      Array::Handle(zone_, unlinked.arguments_descriptor());
   const ICData& ic_data =
       ICData::Handle(zone_, ICData::New(caller_function_, name, descriptor,
                                         DeoptId::kNone, 1, /* args_tested */
@@ -1975,7 +1976,7 @@ FunctionPtr SwitchableCallHandler::ResolveTargetFunction(const Object& data) {
 #endif  // defined(DART_PRECOMPILED_RUNTIME)
 
       name_ = unlinked_call.target_name();
-      args_descriptor_ = unlinked_call.args_descriptor();
+      args_descriptor_ = unlinked_call.arguments_descriptor();
       break;
     }
     case kMonomorphicSmiableCallCid:
@@ -1987,7 +1988,7 @@ FunctionPtr SwitchableCallHandler::ResolveTargetFunction(const Object& data) {
       const auto& unlinked_call = UnlinkedCall::Handle(
           zone_, LoadUnlinkedCall(zone_, isolate_, caller_frame_->pc()));
       name_ = unlinked_call.target_name();
-      args_descriptor_ = unlinked_call.args_descriptor();
+      args_descriptor_ = unlinked_call.arguments_descriptor();
       break;
     }
 #else