Skip to content

Commit e5ff7da

Browse files
committed
[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
1 parent 93f2b59 commit e5ff7da

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

lldb/source/Expression/DWARFExpression.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242
#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
4343
#endif
4444

45-
#include "Plugins/SymbolFile/DWARF/DWARFUnit.h"
46-
4745
using namespace lldb;
4846
using namespace lldb_private;
4947
using namespace lldb_private::dwarf;
@@ -664,7 +662,7 @@ static llvm::Expected<Value> SwiftAsyncEvaluate_DW_OP_entry_value(
664662
#endif // LLDB_ENABLE_SWIFT
665663

666664
static llvm::Error
667-
Evaluate_DW_OP_entry_value(std::vector<Value> &stack, const DWARFUnit *dwarf_cu,
665+
Evaluate_DW_OP_entry_value(std::vector<Value> &stack, const DWARFExpression::Delegate* dwarf_cu,
668666
ExecutionContext *exe_ctx, RegisterContext *reg_ctx,
669667
const DataExtractor &opcodes,
670668
lldb::offset_t &opcode_offset, Log *log) {

0 commit comments

Comments
 (0)