Merge branch 'target' of github.com:oontvoo/llvm-project into target

Author: oontvoo

lldb/include/lldb/Core/Telemetry.h

@@ -15,7 +15,6 @@
 #include "lldb/Utility/StructuredData.h"
 #include "lldb/Utility/UUID.h"
 #include "lldb/lldb-forward.h"
-#include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/FunctionExtras.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
@@ -30,7 +29,6 @@
 
 #include <functional>
 #include <type_traits>
-#include <unordered_map>
 #include <utility>
 
 namespace lldb_private {
@@ -57,10 +55,12 @@ struct LLDBConfig : public ::llvm::telemetry::Config {
 // must have their LLDBEntryKind in the similar form (ie., share common prefix
 // and differ by the last two bits)
 struct LLDBEntryKind : public ::llvm::telemetry::EntryKind {
-  static const llvm::telemetry::KindType BaseInfo = 0b11000000;
-  static const llvm::telemetry::KindType CommandInfo = 0b11010000;
-  static const llvm::telemetry::KindType DebuggerInfo = 0b11000100;
-  static const llvm::telemetry::KindType TargetInfo = 0b11001000;
+  // clang-format off
+  static const llvm::telemetry::KindType BaseInfo     = 0b11000000;
+  static const llvm::telemetry::KindType CommandInfo  = 0b11010000;
+  static const llvm::telemetry::KindType DebuggerInfo = 0b11001000;
+  static const llvm::telemetry::KindType TargetInfo   = 0b11000100;
+  // clang-format on
 };
 
 /// Defines a convenient type for timestamp of various events.

lldb/source/Core/Telemetry.cpp

@@ -149,7 +149,8 @@ TelemetryManager *TelemetryManager::GetInstance() {
 }
 
 void TelemetryManager::SetInstance(std::unique_ptr<TelemetryManager> manager) {
-  g_instance = std::move(manager);
+   if (Config::BuildTimeEnableTelemetry)
+     g_instance = std::move(manager);
 }
 
 } // namespace telemetry