Skip to content

Commit 945955f

Browse files
jkunkeetargos
authored andcommitted
deps: cherry-pick 13a04aba from V8 upstream
Original commit message: fix: move V8_EXPORT_PRIVATE marks to prevent unresolvable references This change fixes missing symbol errors in the Windows 10 on ARM build of Node.js. When a whole class is marked for export, all of its members are marked as well. This can be a problem when inline members call undefined yet inline members of other classes: the exported function will contain a reference to the undefined inline function that should be satisfied at link time, but because the other function is inline no symbol will be produced that will satisfy that reference. Clang gets around this by masking inlined class members from export using /Fc:dllexportInlines-. This is why b0a2a567 worked. Node.js' Windows builds use MSVC and so do not have access to this flag. This results in unresolved symbols at link time. Bug: v8:9465 Change-Id: Ief9c7ab6ba35d22f995939eb62a64d6f1992ed85 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1696771 Reviewed-by: Sigurd Schneider <[email protected]> Reviewed-by: Jakob Gruber <[email protected]> Commit-Queue: Sigurd Schneider <[email protected]> Cr-Commit-Position: refs/heads/master@{#62660} Refs: v8/v8@13a04ab Backport-PR-URL: #28955 PR-URL: #28602 Reviewed-By: João Reis <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent 9b3c115 commit 945955f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

common.gypi

+1-1
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.11',
41+
'v8_embedder_string': '-node.12',
4242

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

deps/v8/src/codegen/arm64/decoder-arm64.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class V8_EXPORT_PRIVATE DecoderVisitor {
9595
};
9696

9797
// A visitor that dispatches to a list of visitors.
98-
class V8_EXPORT_PRIVATE DispatchingDecoderVisitor : public DecoderVisitor {
98+
class DispatchingDecoderVisitor : public DecoderVisitor {
9999
public:
100100
DispatchingDecoderVisitor() {}
101101
virtual ~DispatchingDecoderVisitor() {}

deps/v8/src/codegen/arm64/macro-assembler-arm64.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1968,7 +1968,7 @@ class InstructionAccurateScope {
19681968
// original state, even if the lists were modified by some other means. Note
19691969
// that this scope can be nested but the destructors need to run in the opposite
19701970
// order as the constructors. We do not have assertions for this.
1971-
class V8_EXPORT_PRIVATE UseScratchRegisterScope {
1971+
class UseScratchRegisterScope {
19721972
public:
19731973
explicit UseScratchRegisterScope(TurboAssembler* tasm)
19741974
: available_(tasm->TmpList()),

0 commit comments

Comments
 (0)