Skip to content

Commit a9fd8ad

Browse files
committed
Merge branch 'debugger_info' of github.com:oontvoo/llvm-project into debugger_info
2 parents c011531 + 6027a69 commit a9fd8ad

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

lldb/source/Core/Debugger.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,8 +998,7 @@ void Debugger::Clear() {
998998
// static void Debugger::Destroy(lldb::DebuggerSP &debugger_sp);
999999
// static void Debugger::Terminate();
10001000
llvm::call_once(m_clear_once, [this]() {
1001-
lldb_private::telemetry::ScopedDispatcher<
1002-
lldb_private::telemetry::DebuggerInfo>
1001+
telemetry::ScopedDispatcher<telemetry::DebuggerInfo>
10031002
helper(
10041003
[this](lldb_private::telemetry::DebuggerInfo *info) {
10051004
assert(this == info->debugger);

lldb/source/Core/Telemetry.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,10 @@ TelemetryManager::TelemetryManager(std::unique_ptr<Config> config)
7272

7373
llvm::Error TelemetryManager::preDispatch(TelemetryInfo *entry) {
7474
// Assign the manager_id, and debugger_id, if available, to this entry.
75-
LLDBBaseTelemetryInfo *lldb_entry =
76-
llvm::cast<LLDBBaseTelemetryInfo>(entry);
75+
LLDBBaseTelemetryInfo *lldb_entry = llvm::cast<LLDBBaseTelemetryInfo>(entry);
7776
lldb_entry->SessionId = m_id;
7877
if (Debugger *debugger = lldb_entry->debugger)
7978
lldb_entry->debugger_id = debugger->GetID();
80-
8179
return llvm::Error::success();
8280
}
8381

0 commit comments

Comments
 (0)