Merged: [TurboFan] Optional FunctionTemplateInfo with heap access

nico-hartmann · Commit Bot · commit ebd99c6458df · 2021-01-29T09:06:24.000Z
This CL makes direct heap access consistent with the serialized mode by correctly skipping optimizations if we encounter a FunctionTemplateInfo that is unknown to the broker, because we haven't seen it during serialization. (cherry picked from commit 5d1a7c6) Bug: chromium:1158322 Change-Id: I150f726324435fb89a61286d5a76af616ba81c09 No-Try: true No-Presubmit: true No-Tree-Checks: true Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2656315 Commit-Queue: Nico Hartmann <nicohartmann@chromium.org> Reviewed-by: Lutz Vahl <vahl@chromium.org> Cr-Commit-Position: refs/branch-heads/8.9@{v8#24} Cr-Branched-From: 16b9bbb-refs/heads/8.9.255@{#1} Cr-Branched-From: d16a2a6-refs/heads/master@{#72039}
diff --git a/src/compiler/js-heap-broker.cc b/src/compiler/js-heap-broker.cc
@@ -4091,9 +4091,12 @@ base::Optional<FunctionTemplateInfoRef>
 SharedFunctionInfoRef::function_template_info() const {
   if (data_->should_access_heap()) {
     if (object()->IsApiFunction()) {
-      return FunctionTemplateInfoRef(
-          broker(), broker()->CanonicalPersistentHandle(
-                        object()->function_data(kAcquireLoad)));
+      ObjectData* data = broker()->TryGetOrCreateData(
+          broker()->CanonicalPersistentHandle(
+              object()->function_data(kAcquireLoad)),
+          false);
+      if (data == nullptr) return base::nullopt;
+      return FunctionTemplateInfoRef(broker(), data, true);
     }
     return base::nullopt;
   }
diff --git a/src/compiler/serializer-for-background-compilation.cc b/src/compiler/serializer-for-background-compilation.cc
@@ -3017,7 +3017,8 @@ SerializerForBackgroundCompilation::ProcessMapForNamedPropertyAccess(
         Handle<SharedFunctionInfo> sfi = function.shared().object();
         if (sfi->IsApiFunction()) {
           FunctionTemplateInfoRef fti_ref(
-              broker(), handle(sfi->get_api_func_data(), broker()->isolate()));
+              broker(),
+              broker()->CanonicalPersistentHandle(sfi->get_api_func_data()));
           if (fti_ref.has_call_code()) {
             fti_ref.SerializeCallCode();
             ProcessReceiverMapForApiCall(fti_ref, receiver_map->object());
@@ -3030,7 +3031,8 @@ SerializerForBackgroundCompilation::ProcessMapForNamedPropertyAccess(
       // For JSCallReducer::ReduceJSCall.
       function.Serialize();
     } else {
-      FunctionTemplateInfoRef fti(broker(), access_info.constant());
+      FunctionTemplateInfoRef fti(broker(), broker()->CanonicalPersistentHandle(
+                                                access_info.constant()));
       if (fti.has_call_code()) fti.SerializeCallCode();
     }
   } else if (access_info.IsModuleExport()) {
