Skip to content

Commit 41978ad

Browse files
legendecastargos
authored andcommitted
deps: V8: backport 493cb53691be
Original commit message: [include] suppress clang cast-function-type-mismatch warning on SetWeak Suppress clang warning cast-function-type-mismatch in embedder calls to `SetWeak`. Change-Id: I6c4eda1b932199a2ea4947fe851ffdf2ae04ad73 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6689209 Reviewed-by: Camillo Bruni <cbruni@chromium.org> Commit-Queue: Chengzhong Wu <cwu631@bloomberg.net> Cr-Commit-Position: refs/heads/main@{#101186} Ignore `cast-function-type` instead of `cast-function-type-mismatch` for compatibility with older versions of Clang. Refs: v8/v8@493cb53 PR-URL: #59238 Refs: #58069 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com> Reviewed-By: Jake Yuesong Li <jake.yuesong@gmail.com>
1 parent 0fb005a commit 41978ad

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

common.gypi

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

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.22',
41+
'v8_embedder_string': '-node.23',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/include/v8-persistent-handle.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,9 +488,16 @@ V8_INLINE void PersistentBase<T>::SetWeak(
488488
#if (__GNUC__ >= 8) && !defined(__clang__)
489489
#pragma GCC diagnostic push
490490
#pragma GCC diagnostic ignored "-Wcast-function-type"
491+
#endif
492+
#if __clang__
493+
#pragma clang diagnostic push
494+
#pragma clang diagnostic ignored "-Wcast-function-type"
491495
#endif
492496
api_internal::MakeWeak(this->slot(), parameter,
493497
reinterpret_cast<Callback>(callback), type);
498+
#if __clang__
499+
#pragma clang diagnostic pop
500+
#endif
494501
#if (__GNUC__ >= 8) && !defined(__clang__)
495502
#pragma GCC diagnostic pop
496503
#endif

0 commit comments

Comments
 (0)