Skip to content

Commit f4da308

Browse files
lukealbaotargos
authored andcommitted
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>
1 parent 998feda commit f4da308

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.13',
39+
'v8_embedder_string': '-node.14',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ Kyounga Ra <kyounga@alticast.com>
178178
Loo Rong Jie <loorongjie@gmail.com>
179179
Lu Yahan <yahan@iscas.ac.cn>
180180
Luis Reis <luis.m.reis@gmail.com>
181+
Luke Albao <lukealbao@gmail.com>
181182
Luke Zarko <lukezarko@gmail.com>
182183
Ma Aiguo <maaiguo@uniontech.com>
183184
Maciej Małecki <me@mmalecki.com>

deps/v8/src/diagnostics/perf-jit.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include "src/codegen/assembler.h"
4444
#include "src/codegen/source-position-table.h"
4545
#include "src/diagnostics/eh-frame.h"
46+
#include "src/objects/code-kind.h"
4647
#include "src/objects/objects-inl.h"
4748
#include "src/objects/shared-function-info.h"
4849
#include "src/snapshot/embedded/embedded-data.h"
@@ -225,9 +226,7 @@ void LinuxPerfJitLogger::LogRecordedBuffer(
225226
DisallowGarbageCollection no_gc;
226227
if (v8_flags.perf_basic_prof_only_functions) {
227228
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)) {
231230
return;
232231
}
233232
}

deps/v8/src/logging/log.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ void LinuxPerfBasicLogger::LogRecordedBuffer(Tagged<AbstractCode> code,
446446
DisallowGarbageCollection no_gc;
447447
PtrComprCageBase cage_base(isolate_);
448448
if (v8_flags.perf_basic_prof_only_functions &&
449-
CodeKindIsBuiltinOrJSFunction(code->kind(cage_base))) {
449+
!CodeKindIsBuiltinOrJSFunction(code->kind(cage_base))) {
450450
return;
451451
}
452452

0 commit comments

Comments
 (0)