Vendor import of lldb trunk r290819:vendor/lldb/lldb-trunk-r290819

https://llvm.org/svn/llvm-project/lldb/trunk@290819

1 files changed, 45 insertions, 55 deletions

diff --git a/source/Expression/DiagnosticManager.cpp b/source/Expression/DiagnosticManager.cpp
index 5156ee38a67b..ad06600e098a 100644
--- a/source/Expression/DiagnosticManager.cpp
+++ b/source/Expression/DiagnosticManager.cpp
@@ -16,76 +16,66 @@
 
 using namespace lldb_private;
 
-void
-DiagnosticManager::Dump(Log *log)
-{
-    if (!log)
-        return;
+void DiagnosticManager::Dump(Log *log) {
+  if (!log)
+    return;
 
-    std::string str = GetString();
+  std::string str = GetString();
 
-    // GetString() puts a separator after each diagnostic.
-    // We want to remove the last '\n' because log->PutCString will add one for us.
+  // GetString() puts a separator after each diagnostic.
+  // We want to remove the last '\n' because log->PutCString will add one for
+  // us.
 
-    if (str.size() && str.back() == '\n')
-    {
-        str.pop_back();
-    }
+  if (str.size() && str.back() == '\n') {
+    str.pop_back();
+  }
 
-    log->PutCString(str.c_str());
+  log->PutCString(str.c_str());
 }
 
-static const char *
-StringForSeverity(DiagnosticSeverity severity)
-{
-    switch (severity)
-    {
-        // this should be exhaustive
-        case lldb_private::eDiagnosticSeverityError:
-            return "error: ";
-        case lldb_private::eDiagnosticSeverityWarning:
-            return "warning: ";
-        case lldb_private::eDiagnosticSeverityRemark:
-            return "";
-    }
-    llvm_unreachable("switch needs another case for DiagnosticSeverity enum");
+static const char *StringForSeverity(DiagnosticSeverity severity) {
+  switch (severity) {
+  // this should be exhaustive
+  case lldb_private::eDiagnosticSeverityError:
+    return "error: ";
+  case lldb_private::eDiagnosticSeverityWarning:
+    return "warning: ";
+  case lldb_private::eDiagnosticSeverityRemark:
+    return "";
+  }
+  llvm_unreachable("switch needs another case for DiagnosticSeverity enum");
 }
 
-std::string
-DiagnosticManager::GetString(char separator)
-{
-    std::string ret;
+std::string DiagnosticManager::GetString(char separator) {
+  std::string ret;
 
-    for (const Diagnostic *diagnostic : Diagnostics())
-    {
-        ret.append(StringForSeverity(diagnostic->GetSeverity()));
-        ret.append(diagnostic->GetMessage());
-        ret.push_back(separator);
-    }
+  for (const Diagnostic *diagnostic : Diagnostics()) {
+    ret.append(StringForSeverity(diagnostic->GetSeverity()));
+    ret.append(diagnostic->GetMessage());
+    ret.push_back(separator);
+  }
 
-    return ret;
+  return ret;
 }
 
-size_t
-DiagnosticManager::Printf(DiagnosticSeverity severity, const char *format, ...)
-{
-    StreamString ss;
+size_t DiagnosticManager::Printf(DiagnosticSeverity severity,
+                                 const char *format, ...) {
+  StreamString ss;
 
-    va_list args;
-    va_start(args, format);
-    size_t result = ss.PrintfVarArg(format, args);
-    va_end(args);
+  va_list args;
+  va_start(args, format);
+  size_t result = ss.PrintfVarArg(format, args);
+  va_end(args);
 
-    AddDiagnostic(ss.GetData(), severity, eDiagnosticOriginLLDB);
+  AddDiagnostic(ss.GetString(), severity, eDiagnosticOriginLLDB);
 
-    return result;
+  return result;
 }
 
-size_t
-DiagnosticManager::PutCString(DiagnosticSeverity severity, const char *cstr)
-{
-    if (!cstr)
-        return 0;
-    AddDiagnostic(cstr, severity, eDiagnosticOriginLLDB);
-    return strlen(cstr);
+size_t DiagnosticManager::PutString(DiagnosticSeverity severity,
+                                    llvm::StringRef str) {
+  if (str.empty())
+    return 0;
+  AddDiagnostic(str, severity, eDiagnosticOriginLLDB);
+  return str.size();
 }