Skip to content

[rebranch] Merge main -> rebranch #73856

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 12 commits into from
May 23, 2024

Conversation

hamishknight
Copy link
Contributor

Resolves the following conflict caused by #73769, taking the main side:

<<<<<<< HEAD
  // An alloca may only be described by exactly one dbg.declare.
  if (isa<llvm::AllocaInst>(Storage) &&
      !llvm::findDbgDeclares(Storage).empty())
    return;

||||||| 1f70b2fdffe
  // An alloca may only be described by exactly one dbg.declare.
  if (isa<llvm::AllocaInst>(Storage) &&
      !llvm::FindDbgDeclareUses(Storage).empty())
    return;

=======
>>>>>>> main

Snowy1803 and others added 12 commits May 20, 2024 16:55
This is unnecessarily dropping debug info, as there is currently
no assertion in LLVM. The sharing of stack slot can happen
because of AllocStackHoisting, which is run at -Onone too.
Except for the async context, where it is needed (arguments
within an async function).

We don't support dbg.declare in optimized code, as variables can
be moved by SIL optimization passes. If a partial store is
eliminated, we want a dbg.value on the allocation, and another
dbg.value with a fragment in place of the partial store.

rdar://128155050
…d values.

VarDecls with `@_projectedValueProperty` have already had the property
wrapper transform applied. This only impacts swiftinterfaces, and if
a swiftinterface was produced against a Concurrency library that does
not declare `TaskLocal` as a macro, we need to ignore the macro to avoid
producing duplicate declarations. This is only needed temporarily until
all swiftinterfaces have been built against the Concurrency library
containing the new macro declaration.
A REQUIRES for embedded tests was missing

rdar://128611737
[IRGenDebugInfo] Fix usage of dbg.declare
….3.0

Update the swift-system tag to 1.3.0 to support Windows arm64
[Compile Time Constant Extraction] Extract KeyPath Expressions
tests: fix embedded/static-object.swift
[Macros] Ignore the `@TaskLocal` macro attached to vars with projected value vars.
@hamishknight hamishknight merged commit c8f17b9 into swiftlang:rebranch May 23, 2024
@hamishknight hamishknight deleted the merge-rebranch branch May 23, 2024 21:55
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.

7 participants