[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/, net-libs/nodejs/

[Marek Szuba]

commit:     8343d8dbc07ef7749636b6954a0dc6749536e434
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 24 11:15:17 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jun 24 11:15:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8343d8db

net-libs/nodejs: add 16.4.0, drop 16.3.0

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-libs/nodejs/Manifest                           |   2 +-
 .../files/nodejs-16.1.0-ppc64-segfault.patch       | 119 ---------------------
 .../{nodejs-16.3.0.ebuild => nodejs-16.4.0.ebuild} |   1 -
 3 files changed, 1 insertion(+), 121 deletions(-)

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 17ecdcf2898..8bfd4716c99 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,4 +2,4 @@ DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a98
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v14.17.0.tar.xz 33484212 BLAKE2B 0ad045b7e0b96f564f42cef703338fece2167cb8bfe32840b765b137e01491a43a9c31ce290a3379ffa834ddfe4e2e1f42f95d4d0014240151b06313e0339383 SHA512 7a7683523904580462077c8bf3ee9640f1b674c7df55655049ca50ca3cfdb2973b13088f2b65e4eccf4df2641cd9c86c9716bcd160a5d5863a969cb1e88de093
 DIST node-v14.17.1.tar.xz 33580416 BLAKE2B da5234087945327fc7f3a666a8869426ec5adff3b31b800c59135d9937507bcca7be3c8ca6720c2593b45ec6a9b49c30f71dadbcc03dc0a68c082e3f1746e6df SHA512 354f9f215a4915ca3dbccdbb90c14fb8bfb8b0ed8ece4f95106d7b068affdeab65a79db0beb2c7d6af03dc15567edc5250629deedd38a9de7d581f76716315f8
-DIST node-v16.3.0.tar.xz 33801084 BLAKE2B aa1f2fc6639ccb995252e483b68e1b425a9ad47cd148f5536fad168e94b0582819df511f797b3a278fd54d45e45f64dc701a997c2f17ad72d94d8b02d590cf81 SHA512 f25243521869ee9d99c2490150f8f9361b1603e497364ec559917d5c76e4a857e6c25c90d54b11e5a9d16fabb85e12b052ea768f3c2977ff18e96d33f60d9eff
+DIST node-v16.4.0.tar.xz 33597252 BLAKE2B c43543057f58ed706e525db9956cb258ace88026c9ef1c87d85f07bc02bb382482e9044748b6c865d913ef167544f089e9c5c11fb00c2f0fa7ca9e6bf8d06de8 SHA512 c4e12d8e50c26f21170e998a209d060acfac792bf2a5970efc482f431f483841d40427aafe72a63d5b2bd2cd8d5d1fd19678105ab9b1265f68de6359d98fa1a3

diff --git a/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch b/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch
deleted file mode 100644
index 5ddd1fe7d08..00000000000
--- a/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From ca4bf75504d07db5e1e66ec5c867cd76c90268af Mon Sep 17 00:00:00 2001
-From: Junliang Yan <jyan@××××××.ca>
-Date: Tue, 11 May 2021 08:57:03 -0400
-Subject: [PATCH] ppc: Prevent trampoline emission on deoptimization table generation
-
-The deoptimization table needs to be continuously, so we need to block
-trampoline pool emission during the whole process.
-
-bug: v8:11759
-Change-Id: Ie5e0ffe27dc8e6cdb18985dc2cf26bdadeff318f
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2881918
-Commit-Queue: Junliang Yan <junyan@××××××.com>
-Reviewed-by: Jakob Gruber <jgruber@××××××××.org>
-Cr-Commit-Position: refs/heads/master@{#74506}
-X-Gentoo-bug: https://bugs.gentoo.org/785751
-Backported by gyakovlev@g.o
----
-
-diff --git a/src/codegen/ppc/assembler-ppc.h b/src/codegen/ppc/assembler-ppc.h
-index 794b917..ae04118 100644
---- a/deps/v8/src/codegen/ppc/assembler-ppc.h
-+++ b/deps/v8/src/codegen/ppc/assembler-ppc.h
-@@ -195,6 +195,12 @@
- 
-   void MaybeEmitOutOfLineConstantPool() { EmitConstantPool(); }
- 
-+  inline void CheckTrampolinePoolQuick(int extra_space = 0) {
-+    if (pc_offset() >= next_trampoline_check_ - extra_space) {
-+      CheckTrampolinePool();
-+    }
-+  }
-+
-   // Label operations & relative jumps (PPUM Appendix D)
-   //
-   // Takes a branch opcode (cc) and a label (L) and generates
-@@ -1334,12 +1340,6 @@
-   }
- 
-   inline void UntrackBranch();
--  void CheckTrampolinePoolQuick() {
--    if (pc_offset() >= next_trampoline_check_) {
--      CheckTrampolinePool();
--    }
--  }
--
-   // Instruction generation
-   void a_form(Instr instr, DoubleRegister frt, DoubleRegister fra,
-               DoubleRegister frb, RCBit r);
-diff --git a/src/compiler/backend/code-generator.cc b/src/compiler/backend/code-generator.cc
-index 023e697..62e57fe 100644
---- a/deps/v8/src/compiler/backend/code-generator.cc
-+++ b/deps/v8/src/compiler/backend/code-generator.cc
-@@ -416,23 +416,29 @@
-     std::sort(deoptimization_exits_.begin(), deoptimization_exits_.end(), cmp);
-   }
- 
--  for (DeoptimizationExit* exit : deoptimization_exits_) {
--    if (exit->emitted()) continue;
--    if (Deoptimizer::kSupportsFixedDeoptExitSizes) {
--      exit->set_deoptimization_id(next_deoptimization_id_++);
--    }
--    result_ = AssembleDeoptimizerCall(exit);
--    if (result_ != kSuccess) return;
-+  {
-+#ifdef V8_TARGET_ARCH_PPC64
-+    v8::internal::Assembler::BlockTrampolinePoolScope block_trampoline_pool(
-+        tasm());
-+#endif
-+    for (DeoptimizationExit* exit : deoptimization_exits_) {
-+      if (exit->emitted()) continue;
-+      if (Deoptimizer::kSupportsFixedDeoptExitSizes) {
-+        exit->set_deoptimization_id(next_deoptimization_id_++);
-+      }
-+      result_ = AssembleDeoptimizerCall(exit);
-+      if (result_ != kSuccess) return;
- 
--    // UpdateDeoptimizationInfo expects lazy deopts to be visited in pc_offset
--    // order, which is always the case since they are added to
--    // deoptimization_exits_ in that order, and the optional sort operation
--    // above preserves that order.
--    if (exit->kind() == DeoptimizeKind::kLazy) {
--      int trampoline_pc = exit->label()->pos();
--      last_updated = safepoints()->UpdateDeoptimizationInfo(
--          exit->pc_offset(), trampoline_pc, last_updated,
--          exit->deoptimization_id());
-+      // UpdateDeoptimizationInfo expects lazy deopts to be visited in pc_offset
-+      // order, which is always the case since they are added to
-+      // deoptimization_exits_ in that order, and the optional sort operation
-+      // above preserves that order.
-+      if (exit->kind() == DeoptimizeKind::kLazy) {
-+        int trampoline_pc = exit->label()->pos();
-+        last_updated = safepoints()->UpdateDeoptimizationInfo(
-+            exit->pc_offset(), trampoline_pc, last_updated,
-+            exit->deoptimization_id());
-+      }
-     }
-   }
- 
-diff --git a/src/compiler/backend/ppc/code-generator-ppc.cc b/src/compiler/backend/ppc/code-generator-ppc.cc
-index 3e4e94a..0281376 100644
---- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
-+++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
-@@ -4296,7 +4296,15 @@
- 
- void CodeGenerator::PrepareForDeoptimizationExits(
-     ZoneDeque<DeoptimizationExit*>* exits) {
--  // __ EmitConstantPool();
-+  int total_size = 0;
-+  for (DeoptimizationExit* exit : deoptimization_exits_) {
-+    total_size += (exit->kind() == DeoptimizeKind::kLazy)
-+                      ? Deoptimizer::kLazyDeoptExitSize
-+                      : Deoptimizer::kNonLazyDeoptExitSize;
-+  }
-+
-+  __ CheckTrampolinePoolQuick(total_size);
-+  DCHECK(Deoptimizer::kSupportsFixedDeoptExitSizes);
- }
- 
- void CodeGenerator::AssembleMove(InstructionOperand* source,

diff --git a/net-libs/nodejs/nodejs-16.3.0.ebuild b/net-libs/nodejs/nodejs-16.4.0.ebuild
similarity index 98%
rename from net-libs/nodejs/nodejs-16.3.0.ebuild
rename to net-libs/nodejs/nodejs-16.4.0.ebuild
index f4ae0ff1f25..f4221d00ab4 100644
--- a/net-libs/nodejs/nodejs-16.3.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.4.0.ebuild
@@ -50,7 +50,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
 	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
 	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-16.1.0-ppc64-segfault.patch #785751, drop after it stops applying
 )
 
 pkg_pretend() {