Skip to content

Commit 39b05ff

Browse files
committed
Remove broadcast enum from SBDebugger
Removes the enum for broadcast bits from SBDebugger as they're now in lldb-enumerations.h. This also requires uses of these bits to be updated in some API tests.
1 parent a37c65d commit 39b05ff

File tree

6 files changed

+6
-15
lines changed

6 files changed

+6
-15
lines changed

lldb/include/lldb/API/SBDebugger.h

-9
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,6 @@ class LLDB_API SBInputReader {
4242

4343
class LLDB_API SBDebugger {
4444
public:
45-
// The enum values here need to match their corresponding values in
46-
// Debugger.h.
47-
FLAGS_ANONYMOUS_ENUM(){
48-
eBroadcastBitProgress = (1 << 0),
49-
eBroadcastBitWarning = (1 << 1),
50-
eBroadcastBitError = (1 << 2),
51-
eBroadcastBitProgressCategory = (1 << 4),
52-
};
53-
5445
SBDebugger();
5546

5647
SBDebugger(const lldb::SBDebugger &rhs);

lldb/include/lldb/lldb-enumerations.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1340,11 +1340,11 @@ enum AddressMaskRange {
13401340
};
13411341

13421342
/// Used by the debugger to indicate which events are being broadcasted.
1343-
enum DebuggerBroadcast {
1343+
enum DebuggerBroadcastBit {
13441344
eBroadcastBitProgress = (1 << 0),
13451345
eBroadcastBitWarning = (1 << 1),
13461346
eBroadcastBitError = (1 << 2),
1347-
eBroadcastBitProgressCategory = (1 << 4),
1347+
eBroadcastBitProgressCategory = (1 << 3),
13481348
};
13491349

13501350
} // namespace lldb

lldb/test/API/functionalities/diagnostic_reporting/TestDiagnosticReporting.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def setUp(self):
1515
self.broadcaster = self.dbg.GetBroadcaster()
1616
self.listener = lldbutil.start_listening_from(
1717
self.broadcaster,
18-
lldb.SBDebugger.eBroadcastBitWarning | lldb.SBDebugger.eBroadcastBitError,
18+
lldb.eBroadcastBitWarning | lldb.eBroadcastBitError,
1919
)
2020

2121
def test_dwarf_symbol_loading_diagnostic_report(self):

lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def setUp(self):
1313
TestBase.setUp(self)
1414
self.broadcaster = self.dbg.GetBroadcaster()
1515
self.listener = lldbutil.start_listening_from(
16-
self.broadcaster, lldb.SBDebugger.eBroadcastBitProgress
16+
self.broadcaster, lldb.eBroadcastBitProgress
1717
)
1818

1919
def test_dwarf_symbol_loading_progress_report(self):

lldb/test/API/functionalities/progress_reporting/clang_modules/TestClangModuleBuildProgress.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def test_clang_module_build_progress_report(self):
3434
# other unrelated progress events.
3535
broadcaster = self.dbg.GetBroadcaster()
3636
listener = lldbutil.start_listening_from(
37-
broadcaster, lldb.SBDebugger.eBroadcastBitProgress
37+
broadcaster, lldb.eBroadcastBitProgress
3838
)
3939

4040
# Trigger module builds.

lldb/test/API/macosx/rosetta/TestRosetta.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_rosetta(self):
4949
if rosetta_debugserver_installed():
5050
broadcaster = self.dbg.GetBroadcaster()
5151
listener = lldbutil.start_listening_from(
52-
broadcaster, lldb.SBDebugger.eBroadcastBitWarning
52+
broadcaster, lldb.eBroadcastBitWarning
5353
)
5454

5555
target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(

0 commit comments

Comments
 (0)