Skip to content

[rebranch] Various changes to get rebranch compiling #8938

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 6 commits into from
Jul 3, 2024

Conversation

bnbarham
Copy link

No description provided.

bnbarham and others added 5 commits June 29, 2024 18:19
rdar://129359321

Adds SwiftAggLowerign::shouldReturnTypedErrorIndirectly, which checks if a typed error can be returned directly, similar to how shouldPassIndirectly works, but with the additional restriction of the type having to consist of only integers.

(cherry picked from commit 7936f81)
Now returns a `std::string` rather than a `ConstString`
…e to be implemented by language plugins (llvm#96290)

This patch adds a new `DoPrepareForExecution` API, which can be
implemented by the Clang and Swift language plugins. This also moves
`RunStaticInitializers` into `ExpressionParser::PrepareForExecution`, so
we call it consistently between language plugins.

This *should* be mostly NFC (the static initializers will still only run
after we finished parsing). We've been living on this patch downstream
for sometime now.

rdar://130267058
(cherry picked from commit bfd263a)
@bnbarham
Copy link
Author

@drexin your codegen change needs cherry-picking to next.

@ian-twilightcoder I assume I should also cherry-pick the modulemap change to next too (or is that upstream, I haven't actually checked yet)?

@bnbarham
Copy link
Author

swiftlang/swift#74851

@swift-ci please test

@drexin
Copy link

drexin commented Jul 1, 2024

@drexin your codegen change needs cherry-picking to next.

#8939

@ian-twilightcoder
Copy link

@ian-twilightcoder I assume I should also cherry-pick the modulemap change to next too (or is that upstream, I haven't actually checked yet)?

Probably, which modulemap change?

@bnbarham
Copy link
Author

bnbarham commented Jul 1, 2024

Probably, which modulemap change?

58d2b77

@ian-twilightcoder
Copy link

Probably, which modulemap change?

58d2b77

Yep that should be there.

`ThreadPlanStepOverRange::DoPlanExplainsStop` was moved to
`ThreadPlanStepRange::DoPlanExplansStop` in
3dcce7c. This resulted in a merge
conflict, which renamed this method instead of removing it.
@bnbarham bnbarham requested a review from augusto2112 July 3, 2024 00:42
@bnbarham
Copy link
Author

bnbarham commented Jul 3, 2024

@augusto2112 seems we ended up with an extra DoPlanExplainsStop in some conflict resolution, I've just removed it here (will cherry-pick on next after this is merged)

@bnbarham bnbarham merged commit 7914bae into swiftlang:stable/20240625 Jul 3, 2024
@bnbarham bnbarham deleted the get-rebranch-compiling branch July 3, 2024 05:02
@augusto2112
Copy link

@augusto2112 seems we ended up with an extra DoPlanExplainsStop in some conflict resolution, I've just removed it here (will cherry-pick on next after this is merged)

Looks correct to me!

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.

5 participants