diff options
Diffstat (limited to 'clang/lib/Sema/AnalysisBasedWarnings.cpp')
| -rw-r--r-- | clang/lib/Sema/AnalysisBasedWarnings.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/clang/lib/Sema/AnalysisBasedWarnings.cpp b/clang/lib/Sema/AnalysisBasedWarnings.cpp index 93ee16b..20b7a02 100644 --- a/clang/lib/Sema/AnalysisBasedWarnings.cpp +++ b/clang/lib/Sema/AnalysisBasedWarnings.cpp @@ -1454,22 +1454,22 @@ class ThreadSafetyReporter : public clang::threadSafety::ThreadSafetyHandler { const FunctionDecl *CurrentFunction; bool Verbose; - OptionalNotes getNotes() { + OptionalNotes getNotes() const { if (Verbose && CurrentFunction) { PartialDiagnosticAt FNote(CurrentFunction->getBody()->getLocStart(), - S.PDiag(diag::note_thread_warning_in_fun) - << CurrentFunction->getNameAsString()); + S.PDiag(diag::note_thread_warning_in_fun) + << CurrentFunction->getNameAsString()); return OptionalNotes(1, FNote); } - else return OptionalNotes(); + return OptionalNotes(); } - OptionalNotes getNotes(const PartialDiagnosticAt &Note) { + OptionalNotes getNotes(const PartialDiagnosticAt &Note) const { OptionalNotes ONS(1, Note); if (Verbose && CurrentFunction) { PartialDiagnosticAt FNote(CurrentFunction->getBody()->getLocStart(), - S.PDiag(diag::note_thread_warning_in_fun) - << CurrentFunction->getNameAsString()); + S.PDiag(diag::note_thread_warning_in_fun) + << CurrentFunction->getNameAsString()); ONS.push_back(FNote); } return ONS; @@ -1629,13 +1629,11 @@ class ThreadSafetyReporter : public clang::threadSafety::ThreadSafetyHandler { << LockName << LK); if (Verbose && POK == POK_VarAccess) { PartialDiagnosticAt Note(D->getLocation(), - S.PDiag(diag::note_guarded_by_declared_here) << - D->getNameAsString()); + S.PDiag(diag::note_guarded_by_declared_here) + << D->getNameAsString()); Warnings.push_back(DelayedDiag(Warning, getNotes(Note))); - } - else { + } else Warnings.push_back(DelayedDiag(Warning, getNotes())); - } } } |