You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
[lldb] Partially unbreak the build due to a bad merge conflict resolution
In rdar://147772462 a merge conflict occured due to this upstream
commit:
```
commit 2edf534
Author: Dmitry Vasilyev <[email protected]>
Date: Mon Mar 24 18:40:49 2025 +0400
[LLDB][NFC] Added the interface DWARFExpression::Delegate to break dependencies and reduce lldb-server size (llvm#131645)
```
I resolved the conflict but it failed to build. This patch unbreaks the
build but only when `LLDB_ENABLE_SWIFT` is OFF. This will hopefully be
enough to unblock the automergers. The build will almost certainly be
broken when `LLDB_ENABLE_SWIFT` is ON but I don't understand the code
well enough to fix it correctly so the LLDB folks will need to properly
resolve this in a follow up patch.
rdar://147795421
0 commit comments