deps: make V8 10.2 ABI-compatible with 10.1

targos · targos · commit 742ffefb4449 · 2022-05-23T16:30:37.000+02:00
Create an unused deopt kind to replace `DeoptimizeKind::kSoft`, which was removed. This ensures that the layout of IsolateData doesn't change. Refs: v8/v8@1ff685d PR-URL: #42740 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com>
diff --git a/common.gypi b/common.gypi
@@ -36,7 +36,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.7',
+    'v8_embedder_string': '-node.8',
 
     ##### V8 defaults for Node.js #####
 
diff --git a/deps/v8/include/v8-internal.h b/deps/v8/include/v8-internal.h
@@ -365,8 +365,8 @@ class Internals {
 
   static const uint32_t kNumIsolateDataSlots = 4;
   static const int kStackGuardSize = 7 * kApiSystemPointerSize;
-  static const int kBuiltinTier0EntryTableSize = 9 * kApiSystemPointerSize;
-  static const int kBuiltinTier0TableSize = 9 * kApiSystemPointerSize;
+  static const int kBuiltinTier0EntryTableSize = 10 * kApiSystemPointerSize;
+  static const int kBuiltinTier0TableSize = 10 * kApiSystemPointerSize;
 
   // IsolateData layout guarantees.
   static const int kIsolateCageBaseOffset = 0;
diff --git a/deps/v8/src/builtins/arm/builtins-arm.cc b/deps/v8/src/builtins/arm/builtins-arm.cc
@@ -3537,6 +3537,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 namespace {
 
 // Restarts execution either at the current or next (in execution order)
diff --git a/deps/v8/src/builtins/arm64/builtins-arm64.cc b/deps/v8/src/builtins/arm64/builtins-arm64.cc
@@ -4056,6 +4056,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 namespace {
 
 // Restarts execution either at the current or next (in execution order)
diff --git a/deps/v8/src/builtins/builtins-definitions.h b/deps/v8/src/builtins/builtins-definitions.h
@@ -46,6 +46,8 @@ namespace internal {
   /* Deoptimization entries. */                               \
   ASM(DeoptimizationEntry_Eager, DeoptimizationEntry)         \
   ASM(DeoptimizationEntry_Lazy, DeoptimizationEntry)          \
+  /* Replaces "Soft" for ABI compatibility. */                \
+  ASM(DeoptimizationEntry_Unused, DeoptimizationEntry)        \
                                                               \
   /* GC write barrier. */                                     \
   TFC(RecordWriteEmitRememberedSetSaveFP, WriteBarrier)       \
diff --git a/deps/v8/src/builtins/ia32/builtins-ia32.cc b/deps/v8/src/builtins/ia32/builtins-ia32.cc
@@ -4153,6 +4153,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 namespace {
 
 // Restarts execution either at the current or next (in execution order)
diff --git a/deps/v8/src/builtins/loong64/builtins-loong64.cc b/deps/v8/src/builtins/loong64/builtins-loong64.cc
@@ -3554,6 +3554,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 namespace {
 
 // Restarts execution either at the current or next (in execution order)
diff --git a/deps/v8/src/builtins/mips/builtins-mips.cc b/deps/v8/src/builtins/mips/builtins-mips.cc
@@ -4002,6 +4002,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 namespace {
 
 // Restarts execution either at the current or next (in execution order)
diff --git a/deps/v8/src/builtins/mips64/builtins-mips64.cc b/deps/v8/src/builtins/mips64/builtins-mips64.cc
@@ -3581,6 +3581,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 namespace {
 
 // Restarts execution either at the current or next (in execution order)
diff --git a/deps/v8/src/builtins/ppc/builtins-ppc.cc b/deps/v8/src/builtins/ppc/builtins-ppc.cc
@@ -3839,6 +3839,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 void Builtins::Generate_BaselineOrInterpreterEnterAtBytecode(
     MacroAssembler* masm) {
   // Implement on this platform, https://crrev.com/c/2695591.
diff --git a/deps/v8/src/builtins/riscv64/builtins-riscv64.cc b/deps/v8/src/builtins/riscv64/builtins-riscv64.cc
@@ -3668,6 +3668,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 namespace {
 
 // Restarts execution either at the current or next (in execution order)
diff --git a/deps/v8/src/builtins/s390/builtins-s390.cc b/deps/v8/src/builtins/s390/builtins-s390.cc
@@ -3836,6 +3836,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 void Builtins::Generate_InterpreterOnStackReplacement(MacroAssembler* masm) {
   OnStackReplacement(masm, OsrSourceTier::kInterpreter);
 }
diff --git a/deps/v8/src/builtins/x64/builtins-x64.cc b/deps/v8/src/builtins/x64/builtins-x64.cc
@@ -5007,6 +5007,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {
+  Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);
+}
+
 namespace {
 
 // Restarts execution either at the current or next (in execution order)
diff --git a/deps/v8/src/common/globals.h b/deps/v8/src/common/globals.h
@@ -522,11 +522,13 @@ constexpr int kNoDeoptimizationId = -1;
 // Deoptimize bailout kind:
 // - Eager: a check failed in the optimized code and deoptimization happens
 //   immediately.
+// - Unused: replaces "Soft" for ABI compatibility.
 // - Lazy: the code has been marked as dependent on some assumption which
 //   is checked elsewhere and can trigger deoptimization the next time the
 //   code is executed.
 enum class DeoptimizeKind : uint8_t {
   kEager,
+  kUnused,
   kLazy,
 };
 constexpr DeoptimizeKind kFirstDeoptimizeKind = DeoptimizeKind::kEager;
@@ -540,6 +542,8 @@ constexpr const char* ToString(DeoptimizeKind kind) {
   switch (kind) {
     case DeoptimizeKind::kEager:
       return "Eager";
+    case DeoptimizeKind::kUnused:
+      return "Unused";
     case DeoptimizeKind::kLazy:
       return "Lazy";
   }
diff --git a/deps/v8/src/deoptimizer/deoptimizer.cc b/deps/v8/src/deoptimizer/deoptimizer.cc
@@ -460,6 +460,8 @@ const char* Deoptimizer::MessageFor(DeoptimizeKind kind) {
   switch (kind) {
     case DeoptimizeKind::kEager:
       return "deopt-eager";
+    case DeoptimizeKind::kUnused:
+      return "deopt-unused";
     case DeoptimizeKind::kLazy:
       return "deopt-lazy";
   }
@@ -585,6 +587,8 @@ Builtin Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind kind) {
   switch (kind) {
     case DeoptimizeKind::kEager:
       return Builtin::kDeoptimizationEntry_Eager;
+    case DeoptimizeKind::kUnused:
+      return Builtin::kDeoptimizationEntry_Unused;
     case DeoptimizeKind::kLazy:
       return Builtin::kDeoptimizationEntry_Lazy;
   }
@@ -599,6 +603,9 @@ bool Deoptimizer::IsDeoptimizationEntry(Isolate* isolate, Address addr,
     case Builtin::kDeoptimizationEntry_Eager:
       *type_out = DeoptimizeKind::kEager;
       return true;
+    case Builtin::kDeoptimizationEntry_Unused:
+      *type_out = DeoptimizeKind::kUnused;
+      return true;
     case Builtin::kDeoptimizationEntry_Lazy:
       *type_out = DeoptimizeKind::kLazy;
       return true;

Original file line number	Diff line number	Diff line change
`@@ -3537,6 +3537,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {`
`3537`	`3537`	`Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);`
`3538`	`3538`	`}`
`3539`	`3539`
	`3540`	`+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {`
	`3541`	`+ Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);`
	`3542`	`+}`
	`3543`	`+`
`3540`	`3544`	`namespace {`
`3541`	`3545`
`3542`	`3546`	`// Restarts execution either at the current or next (in execution order)`
Original file line number	Diff line number	Diff line change
`@@ -4056,6 +4056,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {`
`4056`	`4056`	`Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);`
`4057`	`4057`	`}`
`4058`	`4058`
	`4059`	`+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {`
	`4060`	`+ Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);`
	`4061`	`+}`
	`4062`	`+`
`4059`	`4063`	`namespace {`
`4060`	`4064`
`4061`	`4065`	`// Restarts execution either at the current or next (in execution order)`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ namespace internal {`
`46`	`46`	`/* Deoptimization entries. */ \`
`47`	`47`	`ASM(DeoptimizationEntry_Eager, DeoptimizationEntry) \`
`48`	`48`	`ASM(DeoptimizationEntry_Lazy, DeoptimizationEntry) \`
	`49`	`+ /* Replaces "Soft" for ABI compatibility. */ \`
	`50`	`+ ASM(DeoptimizationEntry_Unused, DeoptimizationEntry) \`
`49`	`51`	`\`
`50`	`52`	`/* GC write barrier. */ \`
`51`	`53`	`TFC(RecordWriteEmitRememberedSetSaveFP, WriteBarrier) \`
Original file line number	Diff line number	Diff line change
`@@ -4153,6 +4153,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {`
`4153`	`4153`	`Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);`
`4154`	`4154`	`}`
`4155`	`4155`
	`4156`	`+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {`
	`4157`	`+ Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);`
	`4158`	`+}`
	`4159`	`+`
`4156`	`4160`	`namespace {`
`4157`	`4161`
`4158`	`4162`	`// Restarts execution either at the current or next (in execution order)`
Original file line number	Diff line number	Diff line change
`@@ -3554,6 +3554,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {`
`3554`	`3554`	`Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);`
`3555`	`3555`	`}`
`3556`	`3556`
	`3557`	`+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {`
	`3558`	`+ Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);`
	`3559`	`+}`
	`3560`	`+`
`3557`	`3561`	`namespace {`
`3558`	`3562`
`3559`	`3563`	`// Restarts execution either at the current or next (in execution order)`
Original file line number	Diff line number	Diff line change
`@@ -4002,6 +4002,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {`
`4002`	`4002`	`Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);`
`4003`	`4003`	`}`
`4004`	`4004`
	`4005`	`+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {`
	`4006`	`+ Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);`
	`4007`	`+}`
	`4008`	`+`
`4005`	`4009`	`namespace {`
`4006`	`4010`
`4007`	`4011`	`// Restarts execution either at the current or next (in execution order)`
Original file line number	Diff line number	Diff line change
`@@ -3581,6 +3581,10 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {`
`3581`	`3581`	`Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);`
`3582`	`3582`	`}`
`3583`	`3583`
	`3584`	`+void Builtins::Generate_DeoptimizationEntry_Unused(MacroAssembler* masm) {`
	`3585`	`+ Generate_DeoptimizationEntry(masm, DeoptimizeKind::kUnused);`
	`3586`	`+}`
	`3587`	`+`
`3584`	`3588`	`namespace {`
`3585`	`3589`
`3586`	`3590`	`// Restarts execution either at the current or next (in execution order)`