Even more careful consideration of C++11 13.3.3.1p4. Fixes PR12241.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153523 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 6 insertions, 11 deletions

diff --git a/test/SemaCXX/cxx0x-initializer-constructor.cpp b/test/SemaCXX/cxx0x-initializer-constructor.cpp
index a14283ce7c..da10189257 100644
--- a/test/SemaCXX/cxx0x-initializer-constructor.cpp
+++ b/test/SemaCXX/cxx0x-initializer-constructor.cpp
@@ -237,7 +237,7 @@ namespace PR12167 {
   bool s = f(string<1>());
 }
 
-namespace PR12257 {
+namespace PR12257_PR12241 {
   struct command_pair
   {
     command_pair(int, int);
@@ -253,14 +253,9 @@ namespace PR12257 {
     generator_pair(const command_map);
   };
 
-  const std::initializer_list<generator_pair> x =
-  {
-    {
-      {
-        {
-          {3, 4}
-        }
-      }
-    }
-  };
+  // 5 levels: init list, gen_pair, command_map, init list, command_pair
+  const std::initializer_list<generator_pair> x = {{{{{3, 4}}}}};
+
+  // 4 levels: init list, gen_pair, command_map via init list, command_pair
+  const std::initializer_list<generator_pair> y = {{{{1, 2}}}};
 }