Skip to content

Commit 66f9d2e

Browse files
joyeecheungaduh95
authored andcommitted
deps: V8: cherry-pick e10d795bfe95
Original commit message: Do not use preserve_most when targeting the MSVC ABI In the Microsoft C++ ABI, because preserve_most changes the calling convention, clang mangles it with U while cdecl gets an A, which means components compiled with different toolchains can fail to link. Make it a no-op when targetting MSVC and its ABI. Co-Authored-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com> Refs: #55784 Refs: v8/v8@e10d795 Signed-off-by: Joyee Cheung <joyeec9h3@gmail.com> PR-URL: #66601 Reviewed-By: Richard Lau <richard.lau@ibm.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent fc2b3fb commit 66f9d2e

2 files changed

Lines changed: 5 additions & 1 deletion

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.3',
47+
'v8_embedder_string': '-node.4',
4848

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

‎deps/v8/include/v8config.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,11 +609,15 @@ path. Add it with -I<path> to the command line
609609
// functions.
610610
// Use like:
611611
// V8_NOINLINE V8_PRESERVE_MOST void UnlikelyMethod();
612+
#if V8_CC_MSVC
613+
# define V8_PRESERVE_MOST
614+
#else
612615
#if V8_HAS_ATTRIBUTE_PRESERVE_MOST
613616
# define V8_PRESERVE_MOST __attribute__((preserve_most))
614617
#else
615618
# define V8_PRESERVE_MOST /* NOT SUPPORTED */
616619
#endif
620+
#endif
617621

618622

619623
// A macro (V8_DEPRECATED) to mark classes or functions as deprecated.

0 commit comments

Comments
 (0)