Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick 0e7f91956cec from v8
- Loading branch information
Showing
2 changed files
with
71 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,36 @@ | ||
add_realloc.patch | ||
build_gn.patch | ||
expose_mksnapshot.patch | ||
dcheck.patch | ||
export_symbols_needed_for_windows_build.patch | ||
workaround_an_undefined_symbol_error.patch | ||
do_not_export_private_v8_symbols_on_windows.patch | ||
revert_cleanup_switch_offset_of_to_offsetof_where_possible.patch | ||
fix_build_deprecated_attirbute_for_older_msvc_versions.patch | ||
fix_correct_calling_convention_for_windows_on_arm.patch | ||
perf_make_getpositioninfoslow_faster.patch | ||
cherry-pick-ffd6ff5a61b9.patch | ||
merged_deoptimizer_stricter_checks_during_deoptimization.patch | ||
merged_compiler_mark_jsstoreinarrayliteral_as_needing_a_frame.patch | ||
cherry-pick-36abafa0a316.patch | ||
mac_wasm_work_around_macos_11_2_code_page_decommit_failures.patch | ||
merged_interpreter_store_accumulator_to_callee_after_optional.patch | ||
reland_regexp_hard-crash_on_invalid_offsets_in.patch | ||
regexp_throw_when_length_of_text_nodes_in_alternatives_is_too.patch | ||
cherry-pick-02f84c745fc0.patch | ||
merged_deoptimizer_fix_bug_in_optimizedframe_summarize.patch | ||
cherry-pick-512cd5e179f4.patch | ||
merged_squashed_multiple_commits.patch | ||
lts-m86_builtins_fix_array_prototype_concat_with_species.patch | ||
lts-m86_builtins_harden_array_prototype_concat.patch | ||
merged_compiler_fix_a_bug_in_visitspeculativeintegeradditiveop.patch | ||
merged_turbofan_harden_arrayprototypepop_and_arrayprototypeshift.patch | ||
m86-lts_compiler_fix_off-by-one_error_in_kadditivesafeinteger.patch | ||
merged_wasm-simd_ia32_fix_f64x2_min_max_to_use_registers.patch | ||
merged_liftoff_fix_2gb_memory_accesses_on_32-bit.patch | ||
reland_compiler_fix_more_truncation_bugs_in_simplifiedlowering.patch | ||
cherry-pick-9da8fb7c4b80.patch | ||
m86-lts_squashed_multiple_commits.patch | ||
cherry-pick-fd8cbdf7b888.patch | ||
cherry-pick-fd9ce58ecd13.patch | ||
add_realloc.patch | ||
build_gn.patch | ||
expose_mksnapshot.patch | ||
dcheck.patch | ||
export_symbols_needed_for_windows_build.patch | ||
workaround_an_undefined_symbol_error.patch | ||
do_not_export_private_v8_symbols_on_windows.patch | ||
revert_cleanup_switch_offset_of_to_offsetof_where_possible.patch | ||
fix_build_deprecated_attirbute_for_older_msvc_versions.patch | ||
fix_correct_calling_convention_for_windows_on_arm.patch | ||
perf_make_getpositioninfoslow_faster.patch | ||
cherry-pick-ffd6ff5a61b9.patch | ||
merged_deoptimizer_stricter_checks_during_deoptimization.patch | ||
merged_compiler_mark_jsstoreinarrayliteral_as_needing_a_frame.patch | ||
cherry-pick-36abafa0a316.patch | ||
mac_wasm_work_around_macos_11_2_code_page_decommit_failures.patch | ||
merged_interpreter_store_accumulator_to_callee_after_optional.patch | ||
reland_regexp_hard-crash_on_invalid_offsets_in.patch | ||
regexp_throw_when_length_of_text_nodes_in_alternatives_is_too.patch | ||
cherry-pick-02f84c745fc0.patch | ||
merged_deoptimizer_fix_bug_in_optimizedframe_summarize.patch | ||
cherry-pick-512cd5e179f4.patch | ||
merged_squashed_multiple_commits.patch | ||
lts-m86_builtins_fix_array_prototype_concat_with_species.patch | ||
lts-m86_builtins_harden_array_prototype_concat.patch | ||
merged_compiler_fix_a_bug_in_visitspeculativeintegeradditiveop.patch | ||
merged_turbofan_harden_arrayprototypepop_and_arrayprototypeshift.patch | ||
m86-lts_compiler_fix_off-by-one_error_in_kadditivesafeinteger.patch | ||
merged_wasm-simd_ia32_fix_f64x2_min_max_to_use_registers.patch | ||
merged_liftoff_fix_2gb_memory_accesses_on_32-bit.patch | ||
reland_compiler_fix_more_truncation_bugs_in_simplifiedlowering.patch | ||
cherry-pick-9da8fb7c4b80.patch | ||
m86-lts_squashed_multiple_commits.patch | ||
cherry-pick-fd8cbdf7b888.patch | ||
cherry-pick-fd9ce58ecd13.patch | ||
merged_compiler_fix_a_bug_in.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Georg Neis <neis@chromium.org> | ||
Date: Tue, 13 Jul 2021 17:26:47 +0200 | ||
Subject: 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 <rubber-stamper@appspot.gserviceaccount.com> | ||
Reviewed-by: Adam Klein <adamk@chromium.org> | ||
Commit-Queue: Adam Klein <adamk@chromium.org> | ||
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 33a80f52d0d6b502eefa62a97b1f24400abec3a9..6f25ce706fd178682b764bd3fade01bb6bffcdd6 100644 | ||
--- a/src/compiler/backend/code-generator.cc | ||
+++ b/src/compiler/backend/code-generator.cc | ||
@@ -1306,7 +1306,8 @@ void CodeGenerator::AddTranslationForOperand(Translation* translation, | ||
default: | ||
UNREACHABLE(); | ||
} | ||
- if (literal.object().equals(info()->closure())) { | ||
+ if (literal.object().equals(info()->closure()) && | ||
+ info()->function_context_specializing()) { | ||
translation->StoreJSFrameFunction(); | ||
} else { | ||
int literal_id = DefineDeoptimizationLiteral(literal); |