Fix swift/master-next #633
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This changed in commit f6643af in the swift project.
This appeared to be removed in commit 27df2d9, so most likely this was the result of a mismerge
Commit c9a39a8 modified the constructor. I'm not entirely sure what name we should be giving here, but this code isn't in llvm.org so I gave it something I thought would be reflective of the intention.
…operties GetGlobalModuleListProperties() returns a ModuleListProperties, but that class has an implicitly deleted copy constructor. Therefore we should be grabbing a reference to the ModuleListProperties. Additionally, the uses I noticed in SwiftASTContext can be made const.
|
I think this change is ok (because the default SILOptions has verbose = false), but is there a reason you wrote different code here instead of cherry-picking the LLDB change in #609 for the first commit? |
|
@varungandhi-apple: No reason other than I didn't look into it. |
|
Thanks for the fix anyways! :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Both llvm-project and swift have changed upstream, so we need to adjust accordingly.
cc @JDevlieghere @dcci