<p dir="ltr">Test case?</p>
<div class="gmail_quote">On Jul 9, 2012 6:47 PM, "Richard Trieu" <<a href="mailto:rtrieu@google.com">rtrieu@google.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: rtrieu<br>
Date: Mon Jul  9 20:46:04 2012<br>
New Revision: 159976<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=159976&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=159976&view=rev</a><br>
Log:<br>
Properly update the FormattedArgs vector when the template type diffing falls<br>
back to regular type printing.<br>
<br>
Modified:<br>
    cfe/trunk/include/clang/Basic/Diagnostic.h<br>
    cfe/trunk/lib/AST/ASTDiagnostic.cpp<br>
    cfe/trunk/lib/Basic/Diagnostic.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/Diagnostic.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Diagnostic.h?rev=159976&r1=159975&r2=159976&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Diagnostic.h?rev=159976&r1=159975&r2=159976&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/include/clang/Basic/Diagnostic.h (original)<br>
+++ cfe/trunk/include/clang/Basic/Diagnostic.h Mon Jul  9 20:46:04 2012<br>
@@ -1286,6 +1286,8 @@<br>
   unsigned PrintFromType : 1;<br>
   unsigned ElideType : 1;<br>
   unsigned ShowColors : 1;<br>
+  // The printer sets this variable to true if the template diff was used.<br>
+  unsigned TemplateDiffUsed : 1;<br>
 };<br>
<br>
 /// Special character that the diagnostic printer will use to toggle the bold<br>
<br>
Modified: cfe/trunk/lib/AST/ASTDiagnostic.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTDiagnostic.cpp?rev=159976&r1=159975&r2=159976&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTDiagnostic.cpp?rev=159976&r1=159975&r2=159976&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/AST/ASTDiagnostic.cpp (original)<br>
+++ cfe/trunk/lib/AST/ASTDiagnostic.cpp Mon Jul  9 20:46:04 2012<br>
@@ -254,7 +254,7 @@<br>
   switch (Kind) {<br>
     default: llvm_unreachable("unknown ArgumentKind");<br>
     case DiagnosticsEngine::ak_qualtype_pair: {<br>
-      const TemplateDiffTypes &TDT = *reinterpret_cast<TemplateDiffTypes*>(Val);<br>
+      TemplateDiffTypes &TDT = *reinterpret_cast<TemplateDiffTypes*>(Val);<br>
       QualType FromType =<br>
           QualType::getFromOpaquePtr(reinterpret_cast<void*>(TDT.FromType));<br>
       QualType ToType =<br>
@@ -264,6 +264,7 @@<br>
                                  TDT.PrintFromType, TDT.ElideType,<br>
                                  TDT.ShowColors, S)) {<br>
         NeedQuotes = !TDT.PrintTree;<br>
+        TDT.TemplateDiffUsed = true;<br>
         break;<br>
       }<br>
<br>
<br>
Modified: cfe/trunk/lib/Basic/Diagnostic.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Diagnostic.cpp?rev=159976&r1=159975&r2=159976&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Diagnostic.cpp?rev=159976&r1=159975&r2=159976&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Basic/Diagnostic.cpp (original)<br>
+++ cfe/trunk/lib/Basic/Diagnostic.cpp Mon Jul  9 20:46:04 2012<br>
@@ -821,6 +821,7 @@<br>
       TDT.ToType = getRawArg(ArgNo2);<br>
       TDT.ElideType = getDiags()->ElideType;<br>
       TDT.ShowColors = getDiags()->ShowColors;<br>
+      TDT.TemplateDiffUsed = false;<br>
       intptr_t val = reinterpret_cast<intptr_t>(&TDT);<br>
<br>
       const char *ArgumentEnd = Argument + ArgumentLen;<br>
@@ -859,6 +860,10 @@<br>
                                      Argument, ArgumentLen,<br>
                                      FormattedArgs.data(), FormattedArgs.size(),<br>
                                      OutStr, QualTypeVals);<br>
+      if (!TDT.TemplateDiffUsed)<br>
+        FormattedArgs.push_back(std::make_pair(DiagnosticsEngine::ak_qualtype,<br>
+                                               TDT.FromType));<br>
+<br>
       // Append middle text<br>
       FormatDiagnostic(FirstDollar + 1, SecondDollar, OutStr);<br>
<br>
@@ -869,6 +874,10 @@<br>
                                      Argument, ArgumentLen,<br>
                                      FormattedArgs.data(), FormattedArgs.size(),<br>
                                      OutStr, QualTypeVals);<br>
+      if (!TDT.TemplateDiffUsed)<br>
+        FormattedArgs.push_back(std::make_pair(DiagnosticsEngine::ak_qualtype,<br>
+                                               TDT.ToType));<br>
+<br>
       // Append end text<br>
       FormatDiagnostic(SecondDollar + 1, Pipe, OutStr);<br>
       break;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>