diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/test/SemaCXX/cxx0x-initializer-scalars.cpp | 23 |
2 files changed, 24 insertions, 1 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 9ab263fcfe5..91df49b80c5 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -4880,7 +4880,7 @@ def warn_braces_around_scalar_init : Warning< "braces around scalar initializer">, InGroup<DiagGroup<"braced-scalar-init">>; def ext_many_braces_around_scalar_init : ExtWarn< "too many braces around scalar initializer">, - InGroup<DiagGroup<"many-braces-around-scalar-init">>; + InGroup<DiagGroup<"many-braces-around-scalar-init">>, SFINAEFailure; def ext_complex_component_init : Extension< "complex initialization specifying real and imaginary components " "is an extension">, InGroup<DiagGroup<"complex-component-init">>; diff --git a/clang/test/SemaCXX/cxx0x-initializer-scalars.cpp b/clang/test/SemaCXX/cxx0x-initializer-scalars.cpp index 90b11f3a9e2..a13aa238de6 100644 --- a/clang/test/SemaCXX/cxx0x-initializer-scalars.cpp +++ b/clang/test/SemaCXX/cxx0x-initializer-scalars.cpp @@ -127,3 +127,26 @@ namespace PR12118 { static_assert(sizeof(f({0})) == sizeof(one), "bad overload"); } } + +namespace excess_braces_sfinae { + using valid = int&; + using invalid = float&; + + template<typename T> valid braces1(decltype(T{0})*); + template<typename T> invalid braces1(...); + + template<typename T> valid braces2(decltype(T{{0}})*); + template<typename T> invalid braces2(...); + + template<typename T> valid braces3(decltype(T{{{0}}})*); + template<typename T> invalid braces3(...); + + valid a = braces1<int>(0); + invalid b = braces2<int>(0); + invalid c = braces3<int>(0); + + struct X { int n; }; + valid d = braces1<X>(0); + valid e = braces2<X>(0); + invalid f = braces3<X>(0); +} |
