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

PR31692: Don't mark a declaration as invalid if we haven't necessarily emitted a (user-visible) error. 

llvm-svn: 292847
This commit is contained in:
Richard Smith 2017-01-23 23:14:23 +00:00
parent 3aef809384
commit 8d14835b2e
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Sema/SemaDeclCXX.cpp
View File

@ -12383,9 +12383,9 @@ ExprResult Sema::BuildCXXDefaultInitExpr(SourceLocation Loc, FieldDecl *Field) {
Diag(Loc, diag::err_in_class_initializer_not_yet_parsed)
<< OutermostClass << Field;
Diag(Field->getLocEnd(), diag::note_in_class_initializer_not_yet_parsed);
// Don't diagnose this again.
Field->setInvalidDecl();
// Recover by marking the field invalid, unless we're in a SFINAE context.
if (!isSFINAEContext())
Field->setInvalidDecl();
return ExprError();
}

14
clang/test/SemaCXX/cxx11-default-member-initializers.cpp Normal file
View File

@ -0,0 +1,14 @@
// RUN: %clang_cc1 -std=c++11 -verify %s -pedantic
namespace PR31692 {
struct A {
struct X { int n = 0; } x;
// Trigger construction of X() from a SFINAE context. This must not mark
// any part of X as invalid.
static_assert(!__is_constructible(X), "");
// Check that X::n is not marked invalid.
double &r = x.n; // expected-error {{non-const lvalue reference to type 'double' cannot bind to a value of unrelated type 'int'}}
};
// A::X can now be default-constructed.
static_assert(__is_constructible(A::X), "");
}