Commit adbedcc4 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r292847:

------------------------------------------------------------------------
r292847 | rsmith | 2017-01-23 15:14:23 -0800 (Mon, 23 Jan 2017) | 2 lines

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

------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@292859 91177308-0d34-0410-b5e6-96231b3b80d8
parent 72341111
......@@ -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();
}
 
......
// 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), "");
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment