implement a transparent optimization with the diagnostics stuff:

const char*'s are now not converted to std::strings when the diagnostic
is formed, we just hold onto their pointer and format as needed.

This commit makes DiagnosticClient::FormatDiagnostic even more of a 
mess, I'll fix it in the next commit.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59593 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 10 insertions, 2 deletions

diff --git a/include/clang/Analysis/PathSensitive/BugReporter.h b/include/clang/Analysis/PathSensitive/BugReporter.h
index 98731e1745..72f83bee34 100644
--- a/include/clang/Analysis/PathSensitive/BugReporter.h
+++ b/include/clang/Analysis/PathSensitive/BugReporter.h
@@ -315,8 +315,16 @@ public:
     for (unsigned i = 0, e = Info.getNumRanges(); i != e; ++i)
       R.addRange(Info.getRange(i));
     
-    for (unsigned i = 0, e = Info.getNumArgs(); i != e; ++i)
-      R.addString(Info.getArgStr(i));
+    for (unsigned i = 0, e = Info.getNumArgs(); i != e; ++i) {
+      switch (Info.getArgKind(i)) {
+      case DiagnosticInfo::ak_std_string:   
+        R.addString(Info.getArgStdStr(i));
+        break;
+      case DiagnosticInfo::ak_c_string:   
+        R.addString(Info.getArgCStr(i));
+        break;
+      }
+    }
   }
   
   // Iterators.