commit e69fb2043519d8f36314dd5dd78bb7638c6140f6
author Richard Smith <richard-llvm@metafoo.co.uk> Thu May 23 21:54:14 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu May 23 21:54:14 2013 +0000
tree 97190360baaee162e18d0684a922ef2a86c01c26
parent ce93356e2719d2992763ea747b65beada99f4c9b

Fix assert on temporary std::initializer_list.


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

lib/CodeGen/CGExprAgg.cpp

diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index b974e1d..f8b19d6 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -1159,12 +1159,13 @@
   if (E->hadArrayRangeDesignator())
     CGF.ErrorUnsupported(E, "GNU array range designator extension");
 
+  AggValueSlot Dest = EnsureSlot(E->getType());
+
   if (E->initializesStdInitializerList()) {
     EmitStdInitializerList(Dest.getAddr(), E);
     return;
   }
 
-  AggValueSlot Dest = EnsureSlot(E->getType());
   LValue DestLV = CGF.MakeAddrLValue(Dest.getAddr(), E->getType(),
                                      Dest.getAlignment());
 

test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp

diff --git a/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp b/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp
index d683493..75c04e7 100644
--- a/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp
+++ b/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp
@@ -275,3 +275,13 @@
     for (X x : { x1, x2 }) { }
   }
 }
+
+namespace dtors {
+  struct S {
+    S();
+    ~S();
+  };
+  void f() {
+    std::initializer_list<S>{ S(), S() };
+  }
+}