Skip to content

Commit e63aef9

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 <[email protected]> Commit-Queue: Camillo Bruni <[email protected]> Cr-Commit-Position: refs/heads/main@{#90501} Refs: v8/v8@f7d000a PR-URL: #50077 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent 4b243b5 commit e63aef9

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.23',
39+
'v8_embedder_string': '-node.24',
4040

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

deps/v8/AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ Kyounga Ra <[email protected]>
172172
Loo Rong Jie <[email protected]>
173173
174174
Luis Reis <[email protected]>
175+
Luke Albao <[email protected]>
175176
Luke Zarko <[email protected]>
176177
177178
Maciej Małecki <[email protected]>

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include "src/codegen/assembler.h"
4343
#include "src/codegen/source-position-table.h"
4444
#include "src/diagnostics/eh-frame.h"
45+
#include "src/objects/code-kind.h"
4546
#include "src/objects/objects-inl.h"
4647
#include "src/objects/shared-function-info.h"
4748
#include "src/snapshot/embedded/embedded-data.h"
@@ -222,9 +223,7 @@ void LinuxPerfJitLogger::LogRecordedBuffer(
222223
DisallowGarbageCollection no_gc;
223224
if (v8_flags.perf_basic_prof_only_functions) {
224225
CodeKind code_kind = abstract_code.kind(isolate_);
225-
if (code_kind != CodeKind::INTERPRETED_FUNCTION &&
226-
code_kind != CodeKind::TURBOFAN && code_kind != CodeKind::MAGLEV &&
227-
code_kind != CodeKind::BASELINE) {
226+
if (!CodeKindIsJSFunction(code_kind)) {
228227
return;
229228
}
230229
}

deps/v8/src/logging/log.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ void LinuxPerfBasicLogger::LogRecordedBuffer(AbstractCode code,
433433
DisallowGarbageCollection no_gc;
434434
PtrComprCageBase cage_base(isolate_);
435435
if (v8_flags.perf_basic_prof_only_functions &&
436-
CodeKindIsBuiltinOrJSFunction(code.kind(cage_base))) {
436+
!CodeKindIsBuiltinOrJSFunction(code.kind(cage_base))) {
437437
return;
438438
}
439439

0 commit comments

Comments
 (0)