Skip to content

[SourceKit] Conditionally use in-proc for repl #2763

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
merged 1 commit into from
Jun 7, 2016

Conversation

modocache
Copy link
Contributor

@modocache modocache commented May 28, 2016

What's in this pull request?

Most SourceKit build products are linked against either sourcekitd (which uses XPC) or sourcekitdInProc (which does not) based on the SWIFT_SOURCEKIT_USE_INPROC_LIBRARY CMake option. Adapt sourcekitd-repl to fit this established pattern.

/cc @akyrtzi

Resolved Related bug number: (SR-710)


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

@modocache
Copy link
Contributor Author

modocache commented May 28, 2016

@akyrtzi I was very happy to discover the SWIFT_SOURCEKIT_USE_INPROC_LIBRARY CMake variable! On the other hand, it's not used everywhere. For example, sourcekitdAPI-XPC.cpp is included based on the host platform, not based on this variable.

How would you feel about using SWIFT_SOURCEKIT_USE_INPROC_LIBRARY everywhere a decision about using XPC or InProc needs to be made, and having this CMake variable set in build-script-impl, based on the host platform? I think this would be more consistent.

Most SourceKit build products are linked against either
sourcekitd (which uses XPC) or sourcekitdInProc (which
does not) based on the `SWIFT_SOURCEKIT_USE_INPROC_LIBRARY`
CMake option. Adapt `sourcekitd-repl` to fit this established
pattern.
@modocache modocache force-pushed the sourcekitd-repl-in-proc branch from 75ade04 to 8840510 Compare May 29, 2016 04:27
@modocache
Copy link
Contributor Author

@swift-ci please test

@briancroom
Copy link
Contributor

LGTM

@akyrtzi
Copy link
Contributor

akyrtzi commented Jun 7, 2016

LGTM!

@akyrtzi
Copy link
Contributor

akyrtzi commented Jun 7, 2016

@swift-ci test and merge

@swift-ci swift-ci merged commit 2ae71e9 into swiftlang:master Jun 7, 2016
@modocache modocache deleted the sourcekitd-repl-in-proc branch June 7, 2016 19:06
@modocache
Copy link
Contributor Author

Great! Thanks, @akyrtzi! 🙇

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.

4 participants