Skip to content

Commit 448169c

Browse files
committed
deps: V8: cherry-pick 785a2ea88a90
Original commit message: [tracing] do not define legacy tracing classes when using Perfetto Otherwise the Windows build of Node.js fails with `undefined symbol` errors due to the missing destructor. Change-Id: Id0841aed2f0a8f0cfe8889c39150552e31ee5f96 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/8580049 Reviewed-by: Yang Guo <yangguo@chromium.org> Reviewed-by: Chengzhong Wu <cwu631@bloomberg.net> Commit-Queue: Chengzhong Wu <cwu631@bloomberg.net> Cr-Commit-Position: refs/heads/main@{#110947} Refs: v8/v8@785a2ea PR-URL: #66876 Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 0234235 commit 448169c

4 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎common.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
# Reset this number to 0 on major V8 upgrades.
4646
# Increment by one for each non-official patch applied to deps/v8.
47-
'v8_embedder_string': '-node.50',
47+
'v8_embedder_string': '-node.51',
4848

4949
##### V8 defaults for Node.js #####
5050

‎deps/v8/include/libplatform/v8-tracing.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class TraceEventListener;
3535

3636
const int kTraceMaxNumArgs = 2;
3737

38+
#if !defined(V8_USE_PERFETTO)
3839
class V8_PLATFORM_EXPORT TraceObject {
3940
public:
4041
union ArgValue {
@@ -176,6 +177,7 @@ class V8_PLATFORM_EXPORT TraceBuffer {
176177
TraceBuffer(const TraceBuffer&) = delete;
177178
void operator=(const TraceBuffer&) = delete;
178179
};
180+
#endif // !defined(V8_USE_PERFETTO)
179181

180182
// Options determines how the trace buffer stores data.
181183
enum TraceRecordMode {

‎deps/v8/test/benchmarks/cpp/BUILD.gn‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ if (v8_enable_google_benchmark) {
6363

6464
deps = [
6565
"//:v8",
66+
"//:v8_tracing",
6667
"//third_party/google_benchmark_chrome:google_benchmark",
6768
]
6869
}

‎deps/v8/test/cctest/test-cpu-profiler.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2948,9 +2948,11 @@ TEST(DeoptUntrackedFunction) {
29482948
iprofiler->DeleteProfile(iprofile);
29492949
}
29502950

2951-
using v8::platform::tracing::TraceBuffer;
29522951
using v8::platform::tracing::TraceConfig;
2952+
#if !defined(V8_USE_PERFETTO)
2953+
using v8::platform::tracing::TraceBuffer;
29532954
using v8::platform::tracing::TraceObject;
2955+
#endif // !defined(V8_USE_PERFETTO)
29542956

29552957
namespace {
29562958

0 commit comments

Comments
 (0)