Skip to content

[sourcekitd] Use add_llvm_symbol_exports instead of our old copy #31287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

benlangmuir
Copy link
Contributor

Reduces duplication with llvm and, more importantly, gives us Linux
support via a linker script. This will let us link libsourcekitdInProc
in binaries that have their own copy of llvm symbols on Linux, and let
sourcekit-lsp stop using dlopen with RTLD_DEEPBIND, which fixes
running with asan among other things.

Reduces duplication with llvm and, more importantly, gives us Linux
support via a linker script. This will let us link libsourcekitdInProc
in binaries that have their own copy of llvm symbols on Linux, and let
sourcekit-lsp stop using dlopen with `RTLD_DEEPBIND`, which fixes
running with asan among other things.
@benlangmuir
Copy link
Contributor Author

@swift-ci please test

@benlangmuir
Copy link
Contributor Author

@swift-ci please build toolchain

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - e96f98b

@swift-ci
Copy link
Contributor

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - e96f98b

Install command
tar zxf swift-PR-31287-363-ubuntu16.04.tar.gz
More info

@benlangmuir
Copy link
Contributor Author

@swift-ci please build toolchain macOS

@benlangmuir
Copy link
Contributor Author

@swift-ci please test macOS

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - e96f98b

@compnerd
Copy link
Member

The macOS failure is due to an incorrect automerge in lldb fixed by @fredriss on Friday.

/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/llvm-project/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp:570:32: error: no type named 'ImplicitModuleImportKind' in 'swift::SourceFile'
      const swift::SourceFile::ImplicitModuleImportKind implicit_import_kind =
            ~~~~~~~~~~~~~~~~~~~^
/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/llvm-project/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp:571:30: error: no member named 'ImplicitModuleImportKind' in 'swift::SourceFile'
          swift::SourceFile::ImplicitModuleImportKind::Stdlib;
          ~~~~~~~~~~~~~~~~~~~^
2 errors generated.

Lets give this another shot.

@compnerd
Copy link
Member

@swift-ci please test macOS platform

@compnerd
Copy link
Member

@swift-ci please build toolchain macOS

@swift-ci
Copy link
Contributor

macOS Toolchain
Download Toolchain
Git Sha - e96f98b

Install command
tar -zxf swift-PR-31287-504-osx.tar.gz --directory ~/

@benlangmuir benlangmuir merged commit 876ca7e into swiftlang:master Apr 27, 2020
@benlangmuir benlangmuir deleted the export-list-sourcekitd-linux branch April 27, 2020 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants