[turbofan] Prepare for precomputing PropertyAccessInfo

We'll eventually map each relevant map to a PropertyAccessInfo at
serialization time.

Bug: v8:7790
Change-Id: I739075af3629359f43acfdeb609112f355f1bd38
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1565899
Commit-Queue: Georg Neis <neis@chromium.org>
Auto-Submit: Georg Neis <neis@chromium.org>
Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#60872}

src/compiler/access-info.h

@@ -95,6 +95,7 @@ class PropertyAccessInfo final {
   bool Merge(PropertyAccessInfo const* that, AccessMode access_mode,
              Zone* zone) V8_WARN_UNUSED_RESULT;
 
+  bool IsInvalid() const { return kind() == kInvalid; }
   bool IsNotFound() const { return kind() == kNotFound; }
   bool IsDataConstant() const { return kind() == kDataConstant; }
   bool IsDataField() const { return kind() == kDataField; }
@@ -155,32 +156,37 @@ class AccessInfoFactory final {
       FeedbackNexus nexus, MapHandles const& maps, AccessMode access_mode,
       ZoneVector<ElementAccessInfo>* access_infos) const;
 
-  bool ComputePropertyAccessInfo(Handle<Map> map, Handle<Name> name,
-                                 AccessMode access_mode,
-                                 PropertyAccessInfo* access_info) const;
-  bool ComputePropertyAccessInfo(MapHandles const& maps, Handle<Name> name,
-                                 AccessMode access_mode,
-                                 PropertyAccessInfo* access_info) const;
-  bool ComputePropertyAccessInfos(
+  PropertyAccessInfo ComputePropertyAccessInfo(Handle<Map> map,
+                                               Handle<Name> name,
+                                               AccessMode access_mode) const;
+  PropertyAccessInfo ComputePropertyAccessInfo(MapHandles const& maps,
+                                               Handle<Name> name,
+                                               AccessMode access_mode) const;
+  void ComputePropertyAccessInfos(
       MapHandles const& maps, Handle<Name> name, AccessMode access_mode,
       ZoneVector<PropertyAccessInfo>* access_infos) const;
 
+  // Merge as many of the given {infos} as possible. Return false iff
+  // any of them was invalid.
+  bool FinalizePropertyAccessInfos(
+      ZoneVector<PropertyAccessInfo> infos, AccessMode access_mode,
+      ZoneVector<PropertyAccessInfo>* result) const;
+
  private:
   bool ConsolidateElementLoad(ElementAccessFeedback const& processed,
                               ElementAccessInfo* access_info) const;
-  bool LookupSpecialFieldAccessor(Handle<Map> map, Handle<Name> name,
-                                  PropertyAccessInfo* access_info) const;
-  bool LookupTransition(Handle<Map> map, Handle<Name> name,
-                        MaybeHandle<JSObject> holder,
-                        PropertyAccessInfo* access_info) const;
-  bool ComputeDataFieldAccessInfo(Handle<Map> receiver_map, Handle<Map> map,
-                                  MaybeHandle<JSObject> holder, int number,
-                                  AccessMode access_mode,
-                                  PropertyAccessInfo* access_info) const;
-  bool ComputeAccessorDescriptorAccessInfo(
+  PropertyAccessInfo LookupSpecialFieldAccessor(Handle<Map> map,
+                                                Handle<Name> name) const;
+  PropertyAccessInfo LookupTransition(Handle<Map> map, Handle<Name> name,
+                                      MaybeHandle<JSObject> holder) const;
+  PropertyAccessInfo ComputeDataFieldAccessInfo(Handle<Map> receiver_map,
+                                                Handle<Map> map,
+                                                MaybeHandle<JSObject> holder,
+                                                int number,
+                                                AccessMode access_mode) const;
+  PropertyAccessInfo ComputeAccessorDescriptorAccessInfo(
       Handle<Map> receiver_map, Handle<Name> name, Handle<Map> map,
-      MaybeHandle<JSObject> holder, int number, AccessMode access_mode,
-      PropertyAccessInfo* access_info) const;
+      MaybeHandle<JSObject> holder, int number, AccessMode access_mode) const;
 
   CompilationDependencies* dependencies() const { return dependencies_; }
   JSHeapBroker* broker() const { return broker_; }

src/compiler/js-call-reducer.cc

@@ -6887,14 +6887,13 @@ Reduction JSCallReducer::ReduceRegExpPrototypeTest(Node* node) {
   }
 
   // Compute property access info for "exec" on {resolution}.
-  PropertyAccessInfo ai_exec;
   AccessInfoFactory access_info_factory(broker(), dependencies(),
                                         graph()->zone());
-  if (!access_info_factory.ComputePropertyAccessInfo(
-          MapHandles(regexp_maps.begin(), regexp_maps.end()),
-          factory()->exec_string(), AccessMode::kLoad, &ai_exec)) {
-    return NoChange();
-  }
+  PropertyAccessInfo ai_exec = access_info_factory.ComputePropertyAccessInfo(
+      MapHandles(regexp_maps.begin(), regexp_maps.end()),
+      factory()->exec_string(), AccessMode::kLoad);
+  if (ai_exec.IsInvalid()) return NoChange();
+
   // If "exec" has been modified on {regexp}, we can't do anything.
   if (ai_exec.IsDataConstant()) {
     if (!ai_exec.constant().is_identical_to(

src/compiler/js-native-context-specialization.cc

@@ -400,16 +400,12 @@ Reduction JSNativeContextSpecialization::ReduceJSInstanceOf(Node* node) {
   Handle<Map> receiver_map(receiver->map(), isolate());
 
   // Compute property access info for @@hasInstance on the constructor.
-  PropertyAccessInfo access_info;
   AccessInfoFactory access_info_factory(broker(), dependencies(),
                                         graph()->zone());
-  if (!access_info_factory.ComputePropertyAccessInfo(
-          receiver_map, factory()->has_instance_symbol(), AccessMode::kLoad,
-          &access_info)) {
-    return NoChange();
-  }
-  DCHECK_EQ(access_info.receiver_maps().size(), 1);
-  DCHECK_EQ(access_info.receiver_maps()[0].address(), receiver_map.address());
+  PropertyAccessInfo access_info =
+      access_info_factory.ComputePropertyAccessInfo(
+          receiver_map, factory()->has_instance_symbol(), AccessMode::kLoad);
+  if (access_info.IsInvalid()) return NoChange();
 
   PropertyAccessBuilder access_builder(jsgraph(), broker(), dependencies());
 
@@ -729,19 +725,17 @@ Reduction JSNativeContextSpecialization::ReduceJSResolvePromise(Node* node) {
   }
 
   // Compute property access info for "then" on {resolution}.
-  PropertyAccessInfo access_info;
   AccessInfoFactory access_info_factory(broker(), dependencies(),
                                         graph()->zone());
-  if (!access_info_factory.ComputePropertyAccessInfo(
+  PropertyAccessInfo access_info =
+      access_info_factory.ComputePropertyAccessInfo(
           MapHandles(resolution_maps.begin(), resolution_maps.end()),
-          factory()->then_string(), AccessMode::kLoad, &access_info)) {
-    return NoChange();
-  }
+          factory()->then_string(), AccessMode::kLoad);
+  if (access_info.IsInvalid()) return NoChange();
 
   // We can further optimize the case where {resolution}
   // definitely doesn't have a "then" property.
   if (!access_info.IsNotFound()) return NoChange();
-  PropertyAccessBuilder access_builder(jsgraph(), broker(), dependencies());
 
   dependencies()->DependOnStablePrototypeChains(
       access_info.receiver_maps(),
@@ -1094,18 +1088,15 @@ Reduction JSNativeContextSpecialization::ReduceNamedAccess(
   // Compute property access infos for the receiver maps.
   AccessInfoFactory access_info_factory(broker(), dependencies(),
                                         graph()->zone());
+  ZoneVector<PropertyAccessInfo> raw_access_infos(zone());
+  access_info_factory.ComputePropertyAccessInfos(
+      receiver_maps, name.object(), access_mode, &raw_access_infos);
   ZoneVector<PropertyAccessInfo> access_infos(zone());
-  if (!access_info_factory.ComputePropertyAccessInfos(
-          receiver_maps, name.object(), access_mode, &access_infos)) {
+  if (!access_info_factory.FinalizePropertyAccessInfos(
+          raw_access_infos, access_mode, &access_infos)) {
     return NoChange();
   }
 
-  // Nothing to do if we have no non-deprecated maps.
-  if (access_infos.empty()) {
-    return ReduceSoftDeoptimize(
-        node, DeoptimizeReason::kInsufficientTypeFeedbackForGenericNamedAccess);
-  }
-
   // Ensure that {key} matches the specified {name} (if {key} is given).
   if (key != nullptr) {
     effect = BuildCheckEqualsName(name, key, effect, control);
@@ -2462,14 +2453,12 @@ Reduction JSNativeContextSpecialization::ReduceJSStoreDataPropertyInLiteral(
       handle(Name::cast(nexus.GetFeedbackExtra()->GetHeapObjectAssumeStrong()),
              isolate()));
 
-  PropertyAccessInfo access_info;
   AccessInfoFactory access_info_factory(broker(), dependencies(),
                                         graph()->zone());
-  if (!access_info_factory.ComputePropertyAccessInfo(
-          receiver_map, cached_name.object(), AccessMode::kStoreInLiteral,
-          &access_info)) {
-    return NoChange();
-  }
+  PropertyAccessInfo access_info =
+      access_info_factory.ComputePropertyAccessInfo(
+          receiver_map, cached_name.object(), AccessMode::kStoreInLiteral);
+  if (access_info.IsInvalid()) return NoChange();
 
   Node* receiver = NodeProperties::GetValueInput(node, 0);
   Node* effect = NodeProperties::GetEffectInput(node);