Reland "[cache] Don't compare host defined options if the script was deserialized"

PanTao2 · V8 LUCI CQ · commit 7b677a590459 · 2023-11-02T14:53:08.000Z
This is a reland of commit b9cfb8b Original change's description: > [cache] Don't compare host defined options if the script was deserialized > > We don't serialize host defined options (see > CodeSerializer::SerializeObjectImpl()). > > Change-Id: Icab9fe910a5ec93b5eacc4869aba75034ad8b447 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4805329 > Reviewed-by: Camillo Bruni <cbruni@chromium.org> > Reviewed-by: Toon Verwaest <verwaest@chromium.org> > Commit-Queue: Tao Pan <tao.pan@intel.com> > Cr-Commit-Position: refs/heads/main@{#90698} Change-Id: I7ea5e9355056104ebd25b385aba63c1233d42260 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4998581 Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Toon Verwaest <verwaest@chromium.org> Commit-Queue: Tao Pan <tao.pan@intel.com> Cr-Commit-Position: refs/heads/main@{#90711}
diff --git a/src/objects/compilation-cache-table.cc b/src/objects/compilation-cache-table.cc
@@ -270,6 +270,13 @@ bool ScriptCacheKey::MatchesOrigin(Tagged<Script> script) {
     return false;
   }
 
+  // Don't compare host options if the script was deserialized because we didn't
+  // serialize host options (see CodeSerializer::SerializeObjectImpl())
+  if (script->deserialized() &&
+      script->host_defined_options() ==
+          ReadOnlyRoots(isolate_).empty_fixed_array()) {
+    return true;
+  }
   // TODO(cbruni, chromium:1244145): Remove once migrated to the context
   Handle<Object> maybe_host_defined_options;
   if (!host_defined_options_.ToHandle(&maybe_host_defined_options)) {
diff --git a/src/objects/script-inl.h b/src/objects/script-inl.h
@@ -146,6 +146,12 @@ void Script::set_produce_compile_hints(bool produce_compile_hints) {
   set_flags(ProduceCompileHintsBit::update(flags(), produce_compile_hints));
 }
 
+bool Script::deserialized() const { return DeserializedBit::decode(flags()); }
+
+void Script::set_deserialized(bool value) {
+  set_flags(DeserializedBit::update(flags(), value));
+}
+
 bool Script::is_repl_mode() const { return IsReplModeBit::decode(flags()); }
 
 void Script::set_is_repl_mode(bool value) {
diff --git a/src/objects/script.h b/src/objects/script.h
@@ -124,6 +124,9 @@ class Script : public TorqueGeneratedScript<Script, Struct> {
   inline bool produce_compile_hints() const;
   inline void set_produce_compile_hints(bool produce_compile_hints);
 
+  inline bool deserialized() const;
+  inline void set_deserialized(bool value);
+
   // [compilation_state]: determines whether the script has already been
   // compiled. Encoded in the 'flags' field.
   inline CompilationState compilation_state();
diff --git a/src/objects/script.tq b/src/objects/script.tq
@@ -13,6 +13,7 @@ bitfield struct ScriptFlags extends uint31 {
   // Whether an instrumentation breakpoint is set for this script (wasm only).
   break_on_entry: bool: 1 bit;
   produce_compile_hints: bool: 1 bit;
+  deserialized: bool: 1 bit;
 }
 
 extern class Script extends Struct {
diff --git a/src/snapshot/code-serializer.cc b/src/snapshot/code-serializer.cc
@@ -483,8 +483,9 @@ MaybeHandle<SharedFunctionInfo> CodeSerializer::Deserialize(
     result = merge.CompleteMergeInForeground(isolate, new_script);
   }
 
-  BaselineBatchCompileIfSparkplugCompiled(isolate,
-                                          Script::cast(result->script()));
+  Tagged<Script> script = Script::cast(result->script());
+  script->set_deserialized(true);
+  BaselineBatchCompileIfSparkplugCompiled(isolate, script);
   if (v8_flags.profile_deserialization) {
     double ms = timer.Elapsed().InMillisecondsF();
     int length = cached_data->length();
@@ -619,6 +620,7 @@ MaybeHandle<SharedFunctionInfo> CodeSerializer::FinishOffThreadDeserialize(
     // Fix up the script list to include the newly deserialized script.
     Handle<WeakArrayList> list = isolate->factory()->script_list();
     for (Handle<Script> script : data.scripts) {
+      script->set_deserialized(true);
       BaselineBatchCompileIfSparkplugCompiled(isolate, *script);
       DCHECK(data.persistent_handles->Contains(script.location()));
       list = WeakArrayList::AddToEnd(isolate, list,

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ bitfield struct ScriptFlags extends uint31 {`
`13`	`13`	`// Whether an instrumentation breakpoint is set for this script (wasm only).`
`14`	`14`	`break_on_entry: bool: 1 bit;`
`15`	`15`	`produce_compile_hints: bool: 1 bit;`
	`16`	`+ deserialized: bool: 1 bit;`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`extern class Script extends Struct {`