From 963809884f3a55208047cc908ec9a700cdff8b37 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Mon, 22 Mar 2010 15:47:45 +0000 Subject: Fix a thinko and a typo in the delayed-diagnostic code. llvm-svn: 99178 --- clang/lib/Basic/Diagnostic.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'clang/lib/Basic') diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp index 227c175dc0c..31d3b34c816 100644 --- a/clang/lib/Basic/Diagnostic.cpp +++ b/clang/lib/Basic/Diagnostic.cpp @@ -297,8 +297,8 @@ void Diagnostic::SetDelayedDiagnostic(unsigned DiagID, llvm::StringRef Arg1, return; DelayedDiagID = DiagID; - DelayedDiagArg1 = Arg1; - DelayedDiagArg1 = Arg2; + DelayedDiagArg1 = Arg1.str(); + DelayedDiagArg2 = Arg2.str(); } void Diagnostic::ReportDelayed() { @@ -567,10 +567,11 @@ bool DiagnosticBuilder::Emit() { bool Emitted = DiagObj->ProcessDiag(); // Clear out the current diagnostic object. + unsigned DiagID = DiagObj->CurDiagID; DiagObj->Clear(); // If there was a delayed diagnostic, emit it now. - if (DiagObj->DelayedDiagID) + if (DiagObj->DelayedDiagID && DiagObj->DelayedDiagID != DiagID) DiagObj->ReportDelayed(); // This diagnostic is dead. -- cgit v1.2.3