diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Sema/SemaAccess.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaCXXScopeSpec.cpp | 8 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 14 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiate.cpp | 2 |
6 files changed, 15 insertions, 19 deletions
diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp index dc574f17db1..ffdb0aa27a6 100644 --- a/clang/lib/Sema/SemaAccess.cpp +++ b/clang/lib/Sema/SemaAccess.cpp @@ -1252,7 +1252,8 @@ static void DiagnoseAccessPath(Sema &S, << (base->getAccessSpecifierAsWritten() == AS_none); if (entity.isMemberAccess()) - S.Diag(entity.getTargetDecl()->getLocation(), diag::note_field_decl); + S.Diag(entity.getTargetDecl()->getLocation(), + diag::note_member_declared_at); } static void DiagnoseBadAccess(Sema &S, SourceLocation Loc, diff --git a/clang/lib/Sema/SemaCXXScopeSpec.cpp b/clang/lib/Sema/SemaCXXScopeSpec.cpp index 8c423352589..a70aca2ad86 100644 --- a/clang/lib/Sema/SemaCXXScopeSpec.cpp +++ b/clang/lib/Sema/SemaCXXScopeSpec.cpp @@ -532,9 +532,7 @@ bool Sema::BuildCXXNestedNameSpecifier(Scope *S, Diag(R.getNameLoc(), diag::err_expected_class_or_namespace) << &Identifier << getLangOpts().CPlusPlus; if (NamedDecl *ND = R.getAsSingle<NamedDecl>()) - Diag(ND->getLocation(), - diag::note_expected_class_or_namespace_declared_here) - << &Identifier; + Diag(ND->getLocation(), diag::note_entity_declared_at) << &Identifier; return true; } } @@ -718,9 +716,7 @@ bool Sema::BuildCXXNestedNameSpecifier(Scope *S, Diag(IdentifierLoc, diag::err_expected_class_or_namespace) << &Identifier << getLangOpts().CPlusPlus; if (NamedDecl *ND = Found.getAsSingle<NamedDecl>()) - Diag(ND->getLocation(), - diag::note_expected_class_or_namespace_declared_here) - << &Identifier; + Diag(ND->getLocation(), diag::note_entity_declared_at) << &Identifier; } } else if (SS.isSet()) Diag(IdentifierLoc, diag::err_no_member) << &Identifier << LookupCtx diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 2f9f9824fef..58df59099b0 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -1398,8 +1398,8 @@ Sema::CheckBaseSpecifier(CXXRecordDecl *Class, Diag(BaseLoc, diag::err_class_marked_final_used_as_base) << CXXBaseDecl->getDeclName() << FA->isSpelledAsSealed(); - Diag(CXXBaseDecl->getLocation(), diag::note_previous_decl) - << CXXBaseDecl->getDeclName(); + Diag(CXXBaseDecl->getLocation(), diag::note_entity_declared_at) + << CXXBaseDecl->getDeclName() << FA->getRange(); return nullptr; } diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index a9f11970c95..36b54a248df 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -223,9 +223,8 @@ static void diagnoseUseOfInternalDeclInInlineFunction(Sema &S, S.MaybeSuggestAddingStaticToDecl(Current); - S.Diag(D->getCanonicalDecl()->getLocation(), - diag::note_internal_decl_declared_here) - << D; + S.Diag(D->getCanonicalDecl()->getLocation(), diag::note_entity_declared_at) + << D; } void Sema::MaybeSuggestAddingStaticToDecl(const FunctionDecl *Cur) { @@ -11469,8 +11468,8 @@ diagnoseUncapturableValueReference(Sema &S, SourceLocation loc, << var->getIdentifier(); } - S.Diag(var->getLocation(), diag::note_local_variable_declared_here) - << var->getIdentifier(); + S.Diag(var->getLocation(), diag::note_entity_declared_at) + << var->getIdentifier(); // FIXME: Add additional diagnostic info about class etc. which prevents // capture. @@ -12586,9 +12585,8 @@ bool Sema::CheckCallReturnType(QualType ReturnType, SourceLocation Loc, S.Diag(Loc, diag::err_call_function_incomplete_return) << CE->getSourceRange() << FD->getDeclName() << T; - S.Diag(FD->getLocation(), - diag::note_function_with_incomplete_return_type_declared_here) - << FD->getDeclName(); + S.Diag(FD->getLocation(), diag::note_entity_declared_at) + << FD->getDeclName(); } } Diagnoser(FD, CE); diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index a16960213eb..847d7ae9199 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -6588,7 +6588,8 @@ bool InitializationSequence::Diagnose(Sema &S, << S.Context.getTypeDeclType(Constructor->getParent()) << /*member=*/1 << Entity.getName(); - S.Diag(Entity.getDecl()->getLocation(), diag::note_field_decl); + S.Diag(Entity.getDecl()->getLocation(), + diag::note_member_declared_at); if (const RecordType *Record = Entity.getType()->getAs<RecordType>()) diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index fae1222aed8..75854d1b528 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -1850,7 +1850,7 @@ static bool DiagnoseUninstantiableTemplate(Sema &S, S.Diag(PointOfInstantiation, diag::err_implicit_instantiate_member_undefined) << S.Context.getTypeDeclType(Instantiation); - S.Diag(Pattern->getLocation(), diag::note_member_of_template_here); + S.Diag(Pattern->getLocation(), diag::note_member_declared_at); } else { S.Diag(PointOfInstantiation, diag::err_template_instantiate_undefined) << (TSK != TSK_ImplicitInstantiation) |
