[Swift Rebranch] Cherry-picking swift changes from next branch #38326
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
OptTable::PrintName was renamed 'printName' in commit f1e2d58.
Clang updated the naming in commit aef5d8f in order to be more consistent with c++11 category naming.
Same issue as with TBDGen. Clang doesn't hold onto the Datalayout object anymore, but instead keeps the description string that is constructed on the fly. This patch updates IRGen to behave the same way.
This patch fixes the call to get the datalayout from the clang module. Clang no longer holds onto the DataLayout object, so we have to do that if we want to keep it around. Rather than instanciating it early, we can just hold onto the string description, which clang does keep around, and only construct the actual DataLayout once we need it.
We only see this failure in one file, so I've added a static implementation there. Should take care of that issue.
Something happened so that's not being transitively included. Adding it in explicitly.
LLVM commit 3adb89b updated the API of this function to take a reference to a `SmallVectorImpl` instead of a set to ensure that it behaves deterministically.
…x-sil-writing [Swift Next] Fix SIL writing
…', 'ewilde/rebranch/datalayout', 'ewilde/rebranch/withNullAsEmpty', 'ewilde/rebranch/format', 'ewilde/rebranch/collectUsedGlobals' and 'ewilde/rebranch/SILSerialization' into ewilde/swift-rebranch
|
@swift-ci please smoke test |
edymtt
approved these changes
Jul 9, 2021
|
@swift-ci please smoke test |
|
Retesting after merging swiftlang/llvm-project#3080 |
|
It looks like the auto merger is blocked. Investigating now. |
Adjust now takes the diagnostic engine and the language options. Actually pass those in now too.
|
I'm missing the fixes for the |
|
@swift-ci please smoke test |
|
I'm going to go ahead and merge this so that we can break the dependency cycle with the rebranch auto merger. Once it runs cleanly, we should start seeing failures from the compiler rather than build failures. |
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.
This is a mega-merge of the necessary commits from the swift-next branch that were required to get things building.
These changes were merged into the next branch in the following PRs:
PrintNamecalls ->printNext#38182StringRef::withNullAsEmpty#38131This is getting me pretty close to having things building locally. I'm seeing the build failure associated with swiftlang/llvm-project#3060, and still seeing the crashes that were associated with swiftlang/llvm-project#3074 so I think we need to go poke that repo to get much further. I am seeing some additional crashes in the coroutine splitting that 3074 doesn't fix, so we may need additional fixes for that.