Commit 5f852cc
deps: V8: cherry-pick f7d000a7ae7b
Original commit message:
[logging] Bugfix: LinuxPerfBasicLogger should log JS functions
This patch fixes a typo that was introduced in commit
c51041f45400928cd64fbc8f389c0dd0dd15f82f /
https://chromium-review.googlesource.com/c/v8/v8/+/2336793, which reversed the behavior of the perf_basic_prof_only_functions flag.
This also refactors the equivalent guard in LinuxPerfJitLogger to use the same inline CodeKind API for identifying JS Functions. This is unrelated to the bug, but it seems a fair rider to add on here.
Bug: v8:14387
Change-Id: I25766b0d45f4c65dfec5ae01e094a1ed94111054
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4954225
Reviewed-by: Camillo Bruni <cbruni@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#90501}
Refs: v8/v8@f7d000a
PR-URL: #50344
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>1 parent c1bc811 commit 5f852cc
4 files changed
Lines changed: 5 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.26', | ||
| 39 | + 'v8_embedder_string': '-node.27', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -159,6 +159,7 @@ Kyounga Ra <kyounga@alticast.com> | |||
| 159 | 159 | Loo Rong Jie <loorongjie@gmail.com> | |
| 160 | 160 | Lu Yahan <yahan@iscas.ac.cn> | |
| 161 | 161 | Luis Reis <luis.m.reis@gmail.com> | |
| 162 | + Luke Albao <lukealbao@gmail.com> | ||
| 162 | 163 | Luke Zarko <lukezarko@gmail.com> | |
| 163 | 164 | Ma Aiguo <maaiguo@uniontech.com> | |
| 164 | 165 | Maciej Małecki <me@mmalecki.com> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -42,6 +42,7 @@ | |||
| 42 | 42 | #include "src/codegen/assembler.h" | |
| 43 | 43 | #include "src/codegen/source-position-table.h" | |
| 44 | 44 | #include "src/diagnostics/eh-frame.h" | |
| 45 | + #include "src/objects/code-kind.h" | ||
| 45 | 46 | #include "src/objects/objects-inl.h" | |
| 46 | 47 | #include "src/objects/shared-function-info.h" | |
| 47 | 48 | #include "src/snapshot/embedded/embedded-data.h" | |
@@ -214,11 +215,7 @@ void PerfJitLogger::LogRecordedBuffer( | |||
| 214 | 215 | Handle<AbstractCode> abstract_code, | |
| 215 | 216 | MaybeHandle<SharedFunctionInfo> maybe_shared, const char* name, | |
| 216 | 217 | int length) { | |
| 217 | - if (FLAG_perf_basic_prof_only_functions && | ||
| 218 | - (abstract_code->kind() != CodeKind::INTERPRETED_FUNCTION && | ||
| 219 | - abstract_code->kind() != CodeKind::TURBOFAN && | ||
| 220 | - abstract_code->kind() != CodeKind::MAGLEV && | ||
| 221 | - abstract_code->kind() != CodeKind::BASELINE)) { | ||
| 218 | + if (FLAG_perf_basic_prof_only_functions && !CodeKindIsJSFunction(abstract_code->kind())) { | ||
| 222 | 219 | return; | |
| 223 | 220 | } | |
| 224 | 221 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -364,7 +364,7 @@ void PerfBasicLogger::LogRecordedBuffer(Handle<AbstractCode> code, | |||
| 364 | 364 | MaybeHandle<SharedFunctionInfo>, | |
| 365 | 365 | const char* name, int length) { | |
| 366 | 366 | if (FLAG_perf_basic_prof_only_functions && | |
| 367 | - CodeKindIsBuiltinOrJSFunction(code->kind())) { | ||
| 367 | + !CodeKindIsBuiltinOrJSFunction(code->kind())) { | ||
| 368 | 368 | return; | |
| 369 | 369 | } | |
| 370 | 370 | ||
0 commit comments