Skip to content

Cherry-pick LLVM Bitstream changes #28214

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 2 commits into from
Nov 14, 2019

Conversation

francisvm
Copy link
Contributor

This includes:

  • LLVM Bitstream with llvm::Error work
  • Bitcode / Bitstream separation

jfbastien and others added 2 commits November 12, 2019 10:46
* Fix Swift following bitstream reader API update

Upstream change in rL364464 broke downstream Swift.

(cherry picked from commit 50de105)

 Conflicts:
	lib/Serialization/Deserialization.cpp
	lib/Serialization/ModuleFile.cpp
	tools/driver/modulewrap_main.cpp
The Bitstream part of Bitcode moved to llvm/Bitstream in LLVM. This
updates the uses in swift.

See r365091 [Bitcode] Move Bitstream to a separate library.

(cherry picked from commit 1cd8e19)
@francisvm
Copy link
Contributor Author

Please test with following pull request:
swiftlang/llvm-project#298

@swift-ci please smoke test

@francisvm
Copy link
Contributor Author

Please test with following pull request:
swiftlang/llvm-project#298

@swift-ci please smoke test

@hyp
Copy link
Contributor

hyp commented Nov 14, 2019

Merging in together with swiftlang/llvm-project#298

hyp added a commit to swiftlang/llvm-project that referenced this pull request Nov 14, 2019
…stable/20190619

Manually merge apple/stable/20190619-> swift/master up to bitstream remarks

The swift-ci build & test status was verified over at swiftlang/swift#28214
@hyp hyp merged commit 2f78afa into swiftlang:master Nov 14, 2019
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