diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-05-03 20:26:23 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-05-03 20:26:23 +0000 |
| commit | f0c0337bbfb63d1f9edf145aab535bdf82c20454 (patch) | |
| tree | de30bd60d1dbee4bf7ef487139b3ceb8781c82db /lib/Sema/SemaDecl.cpp | |
| parent | 570918821a8492048e6ab54955c9864bd6c3e952 (diff) | |
Notes
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 054ccb64cbec2..d4c0783638d11 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -2951,7 +2951,8 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, NamedDecl *&OldD, // Merge ns_returns_retained attribute. if (OldTypeInfo.getProducesResult() != NewTypeInfo.getProducesResult()) { if (NewTypeInfo.getProducesResult()) { - Diag(New->getLocation(), diag::err_returns_retained_mismatch); + Diag(New->getLocation(), diag::err_function_attribute_mismatch) + << "'ns_returns_retained'"; Diag(OldLocation, diag::note_previous_declaration); return true; } |