Skip to content

Commit

Permalink
deps: V8: cherry-pick abb4d0a431c0
Browse files Browse the repository at this point in the history
Original commit message:

    Merged: [turbofan] Fix bug in inlining

    Revision: 219b28bfe2ea76de63f034eb75b67e8ded339d94

    BUG=chromium:1127319
    NOTRY=true
    NOPRESUBMIT=true
    NOTREECHECKS=true
    R=tebbi@chromium.org

    Change-Id: I98e77bac81e2cf822a4a4987115e0cf01b1dbc52
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2416383
    Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
    Commit-Queue: Georg Neis <neis@chromium.org>
    Cr-Commit-Position: refs/branch-heads/8.6@{nodejs#12}
    Cr-Branched-From: a64aed2333abf49e494d2a5ce24bbd14fff19f60-refs/heads/8.6.395@{#1}
    Cr-Branched-From: a626bc036236c9bf92ac7b87dc40c9e538b087e3-refs/heads/master@{#69472}

Refs: v8/v8@abb4d0a

PR-URL: nodejs#38275
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
  • Loading branch information
targos committed Apr 30, 2021
1 parent 5372f1f commit b0d1a06
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 5 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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.31',
'v8_embedder_string': '-node.32',

##### V8 defaults for Node.js #####

Expand Down
7 changes: 3 additions & 4 deletions deps/v8/src/compiler/js-inlining-heuristic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,9 @@ void JSInliningHeuristic::Finalize() {
Candidate candidate = *i;
candidates_.erase(i);

// Make sure we don't try to inline dead candidate nodes.
if (candidate.node->IsDead()) {
continue;
}
// Ignore this candidate if it's no longer valid.
if (!IrOpcode::IsInlineeOpcode(candidate.node->opcode())) continue;
if (candidate.node->IsDead()) continue;

// Make sure we have some extra budget left, so that any small functions
// exposed by this function would be given a chance to inline.
Expand Down
40 changes: 40 additions & 0 deletions deps/v8/test/mjsunit/compiler/regress-1127319.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Copyright 2020 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// Flags: --interrupt-budget=1024

function v1() {
const v4 = Reflect;
const v8 = [11.11];
const v10 = {__proto__:1111, a:-1, c:RegExp, f:v8, d:1111, e:-1};
const v12 = [11.11];
function v13() {}
const v16 = {a:v13, b:v13, c:v13, d:v13, e:v13, f:v13, g:v13, h:v13, i:v13, j:v13};
}

function foo() {
let v22 = Number;
v22 = v1;
const v23 = false;
if (v23) {
v22 = Number;
} else {
function v24() {
const v28 = ".Cactus"[0];
for (let v32 = 0; v32 < 7; v32++) {}
}
new Promise(v24);
try {
for (const v37 of v36) {
const v58 = [cactus,cactus,[] = cactus] = v117;
}
} catch(v119) {
}
}
v22();
}

for (let i = 0; i < 10; i++) {
foo();
}

0 comments on commit b0d1a06

Please sign in to comment.