maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use the location of the copy assignment when diagnosing classes that are nontrivial because of it. 

llvm-svn: 160962
This commit is contained in:
Benjamin Kramer 2012-07-30 16:41:40 +00:00
parent bc7dd9ea02
commit e3895eb050
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Sema/SemaDecl.cpp
View File

@ -9513,10 +9513,9 @@ void Sema::DiagnoseNontrivial(const RecordType* T, CXXSpecialMember member) {
case CXXCopyAssignment:
if (RD->hasUserDeclaredCopyAssignment()) {
// FIXME: this should use the location of the copy
// assignment, not the type.
SourceLocation TyLoc = RD->getLocStart();
Diag(TyLoc, diag::note_nontrivial_user_defined) << QT << member;
SourceLocation AssignLoc =
RD->getCopyAssignmentOperator(0)->getLocation();
Diag(AssignLoc, diag::note_nontrivial_user_defined) << QT << member;
return;
}
break;

16
clang/test/SemaCXX/cxx98-compat.cpp
View File

@ -346,3 +346,19 @@ namespace PR13480 {
basic_iterator it; // expected-warning {{union member 'it' with a non-trivial copy constructor is incompatible with C++98}}
};
}
namespace AssignOpUnion {
struct a {
void operator=(const a &it) {}
void operator=(a &it) {} // expected-note {{because type 'AssignOpUnion::a' has a user-declared copy assignment operator}}
};
struct b {
void operator=(const b &it) {} // expected-note {{because type 'AssignOpUnion::b' has a user-declared copy assignment operator}}
};
union test1 {
a x; // expected-warning {{union member 'x' with a non-trivial copy assignment operator is incompatible with C++98}}
b y; // expected-warning {{union member 'y' with a non-trivial copy assignment operator is incompatible with C++98}}
};
}