Pre-fix some build failures that we'll see with newer llvm #41550
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
Add a few includes of Optional.h and Hashing.h. These files are failing ot build in the "next" branch due to changes in llvm's own includes, but it's general goodness to include them on main as well.
We're using c++14, so no need to use the llvm:: copy of this. The llvm version is going away, so this fixes build errors on the "next" branch.
We're already using lvalue functions elsewhere in the codebase, so this isn't adding value. In the "next" branch, this macro has been removed, so this fixes a build error in that case.
In the "next" branch, set_size has been made protected. Instead, users can use resize_for_overwrite, optionally followed by truncate, to handle the same use cases more safely.
|
swiftlang/llvm-project#3995 |
|
swiftlang/llvm-project#3995 |
mwyman
added a commit
to mwyman/swift
that referenced
this pull request
May 20, 2022
PR swiftlang#41550 changed from using `SmallVector::set_size` to `resize_for_overwrite` and `truncate`, but in `sourcekitd-repl` changing from `reserve` changed the size just prior to getting the `end()` of the output array, leading to retrieving the end of the resized array, rather than the array prior to resizing. The conversion needs to begin at the original output's end, rather than the resized-to-reserve output size.
mwyman
added a commit
to mwyman/swift
that referenced
this pull request
May 20, 2022
PR swiftlang#41550 changed from using `SmallVector::set_size` to `resize_for_overwrite` and `truncate`, but in `sourcekitd-repl` changing from `reserve` changed the size just prior to getting the `end()` of the output array, leading to retrieving the end of the resized array, rather than the array prior to resizing. The conversion needs to begin at the original output's end, rather than the resized-to-reserve output size, otherwise the conversion triggers the asserts at lines 101 and 116 (with `res == targetExhausted`).
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.
Fixes some build failures on the "next" branch that also seem like generally good changes to take in "main".
LLVM_LVALUE_FUNCTIONSmallVector::set_sizetoresize_for_overwrite(andtruncate)