Index: cfe/trunk/lib/Sema/SemaInit.cpp =================================================================== --- cfe/trunk/lib/Sema/SemaInit.cpp +++ cfe/trunk/lib/Sema/SemaInit.cpp @@ -3981,6 +3981,8 @@ ImplicitConversionSequence ICS; ICS.setStandard(); ICS.Standard.setAsIdentityConversion(); + if (!E->isRValue()) + ICS.Standard.First = ICK_Lvalue_To_Rvalue; // If E is of a floating-point type, then the conversion is ill-formed // due to narrowing, but go through the motions in order to produce the // right diagnostic. Index: cfe/trunk/test/CXX/dcl.decl/dcl.init/dcl.init.list/p3.cpp =================================================================== --- cfe/trunk/test/CXX/dcl.decl/dcl.init/dcl.init.list/p3.cpp +++ cfe/trunk/test/CXX/dcl.decl/dcl.init/dcl.init.list/p3.cpp @@ -150,35 +150,44 @@ void f(T); f(T{0}); + + char c; + auto t3 = T{c}; } #if __cplusplus <= 201402L - // expected-error@-15 5{{cannot initialize}} - // expected-error@-15 5{{cannot initialize}} - // expected-error@-15 5{{cannot initialize}} + // expected-error@-18 5{{cannot initialize}} + // expected-error@-18 5{{cannot initialize}} + // expected-error@-18 5{{cannot initialize}} + // // + // expected-error@-18 5{{cannot initialize}} // - // expected-error@-15 5{{cannot initialize}} + // expected-error@-18 5{{cannot initialize}} // - // expected-error@-15 5{{cannot initialize}} + // expected-error@-18 5{{cannot initialize}} // - // expected-error@-15 5{{cannot initialize}} // + // expected-error@-18 5{{cannot initialize}} // - // expected-error@-15 5{{cannot initialize}} + // + // expected-error@-18 5{{cannot initialize}} #else - // expected-error@-29 {{cannot initialize}} - // expected-error@-29 {{cannot initialize}} - // expected-error@-29 {{cannot initialize}} + // expected-error@-35 {{cannot initialize}} + // expected-error@-35 {{cannot initialize}} + // expected-error@-35 {{cannot initialize}} + // // + // expected-error@-35 {{cannot initialize}} // - // expected-error@-29 {{cannot initialize}} + // expected-error@-35 {{cannot initialize}} // - // expected-error@-29 {{cannot initialize}} + // expected-error@-35 {{cannot initialize}} // - // expected-error@-29 {{cannot initialize}} // + // expected-error@-35 {{cannot initialize}} // - // expected-error@-29 {{cannot initialize}} + // + // expected-error@-35 {{cannot initialize}} #endif template void bad() { @@ -252,4 +261,12 @@ (void)B{0.0}; // expected-error {{type 'double' cannot be narrowed}} #endif } + +#if __cplusplus > 201402L + enum class F : unsigned {}; + F f1(unsigned x) { return F{x}; } + F f2(const unsigned x) { return F{x}; } + F f3(bool x) { return F{x}; } + F f4(const bool x) { return F{x}; } +#endif }