Skip to content

Commit df2e944

Browse files
authored
Merge pull request #10459 from swiftlang/rdar137968318
[lldb-dap] Correctly report breakpoints as resolved on macOS (llvm#129589)
2 parents 30a56da + 394bbfc commit df2e944

21 files changed

+1942
-1531
lines changed

lldb/bindings/headers.swig

+1-79
Original file line numberDiff line numberDiff line change
@@ -7,83 +7,5 @@
77
/* The liblldb header files to be included. */
88
%{
99
#include "lldb/lldb-public.h"
10-
#include "lldb/API/SBAddress.h"
11-
#include "lldb/API/SBAddressRange.h"
12-
#include "lldb/API/SBAddressRangeList.h"
13-
#include "lldb/API/SBAttachInfo.h"
14-
#include "lldb/API/SBBlock.h"
15-
#include "lldb/API/SBBreakpoint.h"
16-
#include "lldb/API/SBBreakpointLocation.h"
17-
#include "lldb/API/SBBreakpointName.h"
18-
#include "lldb/API/SBBroadcaster.h"
19-
#include "lldb/API/SBCommandInterpreter.h"
20-
#include "lldb/API/SBCommandInterpreterRunOptions.h"
21-
#include "lldb/API/SBCommandReturnObject.h"
22-
#include "lldb/API/SBCommunication.h"
23-
#include "lldb/API/SBCompileUnit.h"
24-
#include "lldb/API/SBSaveCoreOptions.h"
25-
#include "lldb/API/SBData.h"
26-
#include "lldb/API/SBDebugger.h"
27-
#include "lldb/API/SBDeclaration.h"
28-
#include "lldb/API/SBEnvironment.h"
29-
#include "lldb/API/SBError.h"
30-
#include "lldb/API/SBEvent.h"
31-
#include "lldb/API/SBExecutionContext.h"
32-
#include "lldb/API/SBExpressionOptions.h"
33-
#include "lldb/API/SBFile.h"
34-
#include "lldb/API/SBFileSpec.h"
35-
#include "lldb/API/SBFileSpecList.h"
36-
#include "lldb/API/SBFormat.h"
37-
#include "lldb/API/SBFrame.h"
38-
#include "lldb/API/SBFunction.h"
39-
#include "lldb/API/SBHostOS.h"
40-
#include "lldb/API/SBInstruction.h"
41-
#include "lldb/API/SBInstructionList.h"
42-
#include "lldb/API/SBLanguages.h"
43-
#include "lldb/API/SBLanguageRuntime.h"
44-
#include "lldb/API/SBLaunchInfo.h"
45-
#include "lldb/API/SBLineEntry.h"
46-
#include "lldb/API/SBListener.h"
47-
#include "lldb/API/SBMemoryRegionInfo.h"
48-
#include "lldb/API/SBMemoryRegionInfoList.h"
49-
#include "lldb/API/SBModule.h"
50-
#include "lldb/API/SBModuleSpec.h"
51-
#include "lldb/API/SBPlatform.h"
52-
#include "lldb/API/SBProcess.h"
53-
#include "lldb/API/SBProcessInfo.h"
54-
#include "lldb/API/SBProcessInfoList.h"
55-
#include "lldb/API/SBProgress.h"
56-
#include "lldb/API/SBQueue.h"
57-
#include "lldb/API/SBQueueItem.h"
58-
#include "lldb/API/SBReproducer.h"
59-
#include "lldb/API/SBScriptObject.h"
60-
#include "lldb/API/SBSection.h"
61-
#include "lldb/API/SBSourceManager.h"
62-
#include "lldb/API/SBStatisticsOptions.h"
63-
#include "lldb/API/SBStream.h"
64-
#include "lldb/API/SBStringList.h"
65-
#include "lldb/API/SBStructuredData.h"
66-
#include "lldb/API/SBSymbol.h"
67-
#include "lldb/API/SBSymbolContext.h"
68-
#include "lldb/API/SBSymbolContextList.h"
69-
#include "lldb/API/SBTarget.h"
70-
#include "lldb/API/SBThread.h"
71-
#include "lldb/API/SBThreadCollection.h"
72-
#include "lldb/API/SBThreadPlan.h"
73-
#include "lldb/API/SBTrace.h"
74-
#include "lldb/API/SBTraceCursor.h"
75-
#include "lldb/API/SBType.h"
76-
#include "lldb/API/SBTypeCategory.h"
77-
#include "lldb/API/SBTypeEnumMember.h"
78-
#include "lldb/API/SBTypeFilter.h"
79-
#include "lldb/API/SBTypeFormat.h"
80-
#include "lldb/API/SBTypeNameSpecifier.h"
81-
#include "lldb/API/SBTypeSummary.h"
82-
#include "lldb/API/SBTypeSynthetic.h"
83-
#include "lldb/API/SBUnixSignals.h"
84-
#include "lldb/API/SBValue.h"
85-
#include "lldb/API/SBValueList.h"
86-
#include "lldb/API/SBVariablesOptions.h"
87-
#include "lldb/API/SBWatchpoint.h"
88-
#include "lldb/API/SBWatchpointOptions.h"
10+
#include "lldb/API/LLDB.h"
8911
%}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
%extend lldb::SBMutex {
2+
#ifdef SWIGPYTHON
3+
%pythoncode %{
4+
def __enter__(self):
5+
self.lock()
6+
return self
7+
8+
def __exit__(self, exc_type, exc_value, traceback):
9+
self.unlock()
10+
%}
11+
#endif
12+
}

lldb/bindings/interfaces.swig

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
%include "./interface/SBMemoryRegionInfoListDocstrings.i"
5252
%include "./interface/SBModuleDocstrings.i"
5353
%include "./interface/SBModuleSpecDocstrings.i"
54+
%include "./interface/SBMutexExtensions.i"
5455
%include "./interface/SBPlatformDocstrings.i"
5556
%include "./interface/SBProcessDocstrings.i"
5657
%include "./interface/SBProcessInfoDocstrings.i"
@@ -121,15 +122,16 @@
121122
%include "lldb/API/SBHostOS.h"
122123
%include "lldb/API/SBInstruction.h"
123124
%include "lldb/API/SBInstructionList.h"
124-
%include "lldb/API/SBLanguages.h"
125125
%include "lldb/API/SBLanguageRuntime.h"
126+
%include "lldb/API/SBLanguages.h"
126127
%include "lldb/API/SBLaunchInfo.h"
127128
%include "lldb/API/SBLineEntry.h"
128129
%include "lldb/API/SBListener.h"
129130
%include "lldb/API/SBMemoryRegionInfo.h"
130131
%include "lldb/API/SBMemoryRegionInfoList.h"
131132
%include "lldb/API/SBModule.h"
132133
%include "lldb/API/SBModuleSpec.h"
134+
%include "lldb/API/SBMutex.h"
133135
%include "lldb/API/SBPlatform.h"
134136
%include "lldb/API/SBProcess.h"
135137
%include "lldb/API/SBProcessInfo.h"

0 commit comments

Comments
 (0)