From 4c15b0691874119713985b99d2967f0f4e1a0134 Mon Sep 17 00:00:00 2001 From: Pedro Pontes Date: Mon, 19 Jul 2021 22:31:28 +0200 Subject: [PATCH] chore: cherry-pick 0e7f91956cec from v8 --- patches/v8/.patches | 1 + patches/v8/cherry-pick-0e7f91956cec.patch | 35 +++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 patches/v8/cherry-pick-0e7f91956cec.patch diff --git a/patches/v8/.patches b/patches/v8/.patches index ba93de3f5297a..d3db1687316c3 100644 --- a/patches/v8/.patches +++ b/patches/v8/.patches @@ -33,3 +33,4 @@ cherry-pick-9da8fb7c4b80.patch m86-lts_squashed_multiple_commits.patch cherry-pick-fd8cbdf7b888.patch cherry-pick-fd9ce58ecd13.patch +cherry-pick-0e7f91956cec.patch diff --git a/patches/v8/cherry-pick-0e7f91956cec.patch b/patches/v8/cherry-pick-0e7f91956cec.patch new file mode 100644 index 0000000000000..7c4bc61c1b2b4 --- /dev/null +++ b/patches/v8/cherry-pick-0e7f91956cec.patch @@ -0,0 +1,35 @@ +From 0e7f91956cecd8918ba4e8f721a59bae9f339b59 Mon Sep 17 00:00:00 2001 +From: Georg Neis +Date: Tue, 13 Jul 2021 17:26:47 +0200 +Subject: [PATCH] Merged: [compiler] Fix a bug in CodeGenerator::AddTranslationForOperand + +(cherry picked from commit 374354bfe4a30740b96936b33e522d6fcd1cda67) + +Bug: chromium:1228407 +No-Try: true +No-Presubmit: true +No-Tree-Checks: true +Change-Id: I358d8736b7b5f87300496cbb39a7689d8207d85f +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3027260 +Bot-Commit: Rubber Stamper +Reviewed-by: Adam Klein +Commit-Queue: Adam Klein +Cr-Commit-Position: refs/branch-heads/9.1@{#77} +Cr-Branched-From: 0e4ac64a8cf298b14034a22f9fe7b085d2cb238d-refs/heads/9.1.269@{#1} +Cr-Branched-From: f565e72d5ba88daae35a59d0f978643e2343e912-refs/heads/master@{#73847} +--- + +diff --git a/src/compiler/backend/code-generator.cc b/src/compiler/backend/code-generator.cc +index 3ed9eaa..aaa5485 100644 +--- a/src/compiler/backend/code-generator.cc ++++ b/src/compiler/backend/code-generator.cc +@@ -1400,7 +1400,8 @@ + default: + UNREACHABLE(); + } +- if (literal.object().equals(info()->closure())) { ++ if (literal.object().equals(info()->closure()) && ++ info()->function_context_specializing()) { + translations_.StoreJSFrameFunction(); + } else { + int literal_id = DefineDeoptimizationLiteral(literal);