Skip to content

Commit

Permalink
deps, v8: strip out overly broad DLL Export annotations
Browse files Browse the repository at this point in the history
This change fixes the ARM64 Windows build by removing the more broad
of two conflicting DLL Export annotations in two places.

The conflict is because both LLVM and MSVC forbid having both a class
and a class member marked for export.

Preferring the more narrowly targeted annotation avoids needing the
LLVM-specific linker flag /Fc:dllexportInlines- to avoid exporting
inline members of classes. When such a function is inlined and
references inline members of other classes, the member of the other
class is referenced and not inlined, causing missing symbol errors
later (since the function is otherwise always inlined, references to it
do not resolve).

A similar problem has been fixed before in V8:

https://chromium-review.googlesource.com/c/v8/v8/+/1478216
  • Loading branch information
jkunkee authored and joaocgreis committed Jul 11, 2019
1 parent e800f9d commit 76a5d9c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion deps/v8/src/arm64/decoder-arm64.h
Expand Up @@ -96,7 +96,7 @@ class V8_EXPORT_PRIVATE DecoderVisitor {
};

// A visitor that dispatches to a list of visitors.
class V8_EXPORT_PRIVATE DispatchingDecoderVisitor : public DecoderVisitor {
class DispatchingDecoderVisitor : public DecoderVisitor {
public:
DispatchingDecoderVisitor() {}
virtual ~DispatchingDecoderVisitor() {}
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/arm64/macro-assembler-arm64.h
Expand Up @@ -2081,7 +2081,7 @@ class InstructionAccurateScope {
// original state, even if the lists were modified by some other means. Note
// that this scope can be nested but the destructors need to run in the opposite
// order as the constructors. We do not have assertions for this.
class V8_EXPORT_PRIVATE UseScratchRegisterScope {
class UseScratchRegisterScope {
public:
explicit UseScratchRegisterScope(TurboAssembler* tasm)
: available_(tasm->TmpList()),
Expand Down

0 comments on commit 76a5d9c

Please sign in to comment.