formatting + more checks

Author: oontvoo

lldb/source/Core/Telemetry.cpp

@@ -55,8 +55,7 @@ void LLDBBaseTelemetryInfo::serialize(Serializer &serializer) const {
 }
 
 TelemetryManager::TelemetryManager(std::unique_ptr<Config> config)
-    : m_config(std::move(config))
-}
+    : m_config(std::move(config)) {}
 
 llvm::Error TelemetryManager::preDispatch(TelemetryInfo *entry) {
   // Do nothing for now.
@@ -66,7 +65,11 @@ llvm::Error TelemetryManager::preDispatch(TelemetryInfo *entry) {
 }
 
 std::unique_ptr<TelemetryManager> TelemetryManager::g_instance = nullptr;
-TelemetryManager *TelemetryManager::getInstance() { return g_instance.get(); }
+TelemetryManager *TelemetryManager::getInstance() {
+  if (!Config::BuildTimeEnableTelemetry)
+    return nullptr;
+  return g_instance.get();
+}
 
 void TelemetryManager::setInstance(std::unique_ptr<TelemetryManager> manager) {
   g_instance = std::move(manager);

llvm/include/llvm/Telemetry/Telemetry.h

@@ -65,9 +65,9 @@ class Serializer {
 /// points specific to a vendor's implementation.
 struct Config {
 #ifdef LLVM_ENABLE_TELEMETRY
-  static bool BuildTimeEnableTelemetry = true;
+  static const bool BuildTimeEnableTelemetry = true;
 #else
-  static bool BuildTimeEnableTelemetry = false;
+  static const bool BuildTimeEnableTelemetry = false;
 #endif
   virtual ~Config() : EnableTelemetry(BuildTimeEnableTelemetry) {}
 

llvm/lib/Telemetry/Telemetry.cpp

@@ -21,6 +21,8 @@ void TelemetryInfo::serialize(Serializer &serializer) const {
 }
 
 Error Manager::dispatch(TelemetryInfo *Entry) {
+  assert(Config::BuildTimeEnableTelemetry &&
+         "Telemetry should have been enabled");
   if (Error Err = preDispatch(Entry))
     return Err;