Commit b682e7f
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: #50302
Reviewed-By: Vinícius Lourenço Claro Cardoso <contact@viniciusl.com.br>
Reviewed-By: Debadree Chatterjee <debadree333@gmail.com>
PR-URL: #50115
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>1 parent a60090c commit b682e7f
4 files changed
Lines changed: 5 additions & 5 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.7', | ||
| 39 | + 'v8_embedder_string': '-node.8', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -179,6 +179,7 @@ Loo Rong Jie <loorongjie@gmail.com> | |||
| 179 | 179 | Lu Yahan <yahan@iscas.ac.cn> | |
| 180 | 180 | Ludovic Mermod <ludovic.mermod@gmail.com> | |
| 181 | 181 | Luis Reis <luis.m.reis@gmail.com> | |
| 182 | + Luke Albao <lukealbao@gmail.com> | ||
| 182 | 183 | Luke Zarko <lukezarko@gmail.com> | |
| 183 | 184 | Ma Aiguo <maaiguo@uniontech.com> | |
| 184 | 185 | Maciej Małecki <me@mmalecki.com> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -43,6 +43,7 @@ | |||
| 43 | 43 | #include "src/codegen/assembler.h" | |
| 44 | 44 | #include "src/codegen/source-position-table.h" | |
| 45 | 45 | #include "src/diagnostics/eh-frame.h" | |
| 46 | + #include "src/objects/code-kind.h" | ||
| 46 | 47 | #include "src/objects/objects-inl.h" | |
| 47 | 48 | #include "src/objects/shared-function-info.h" | |
| 48 | 49 | #include "src/snapshot/embedded/embedded-data.h" | |
@@ -225,9 +226,7 @@ void LinuxPerfJitLogger::LogRecordedBuffer( | |||
| 225 | 226 | DisallowGarbageCollection no_gc; | |
| 226 | 227 | if (v8_flags.perf_basic_prof_only_functions) { | |
| 227 | 228 | CodeKind code_kind = abstract_code->kind(isolate_); | |
| 228 | - if (code_kind != CodeKind::INTERPRETED_FUNCTION && | ||
| 229 | - code_kind != CodeKind::TURBOFAN && code_kind != CodeKind::MAGLEV && | ||
| 230 | - code_kind != CodeKind::BASELINE) { | ||
| 229 | + if (!CodeKindIsJSFunction(code_kind)) { | ||
| 231 | 230 | return; | |
| 232 | 231 | } | |
| 233 | 232 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -446,7 +446,7 @@ void LinuxPerfBasicLogger::LogRecordedBuffer(Tagged<AbstractCode> code, | |||
| 446 | 446 | DisallowGarbageCollection no_gc; | |
| 447 | 447 | PtrComprCageBase cage_base(isolate_); | |
| 448 | 448 | if (v8_flags.perf_basic_prof_only_functions && | |
| 449 | - CodeKindIsBuiltinOrJSFunction(code->kind(cage_base))) { | ||
| 449 | + !CodeKindIsBuiltinOrJSFunction(code->kind(cage_base))) { | ||
| 450 | 450 | return; | |
| 451 | 451 | } | |
| 452 | 452 | ||
0 commit comments