Hi Bill, please pull this onto the branch.<br><br><div class="gmail_quote">On Thu, May 23, 2013 at 4:20 PM, Richard Smith <span dir="ltr"><<a href="mailto:richard-llvm@metafoo.co.uk" target="_blank">richard-llvm@metafoo.co.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br>
Date: Thu May 23 18:20:04 2013<br>
New Revision: 182624<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=182624&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=182624&view=rev</a><br>
Log:<br>
Fix crash-on-invalid if list-initialization works, but we bail out when<br>
building the resulting expression because it invokes a deleted constructor.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Sema/SemaInit.cpp<br>
    cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaInit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaInit.cpp?rev=182624&r1=182623&r2=182624&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaInit.cpp?rev=182624&r1=182623&r2=182624&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaInit.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaInit.cpp Thu May 23 18:20:04 2013<br>
@@ -5745,7 +5745,8 @@ InitializationSequence::Perform(Sema &S,<br>
         ExprResult Res = S.PerformCopyInitialization(<br>
                              Element, Init.get()->getExprLoc(), Init,<br>
                              /*TopLevelOfInitList=*/ true);<br>
-        assert(!Res.isInvalid() && "Result changed since try phase.");<br>
+        if (Res.isInvalid())<br>
+          return ExprError();<br>
         Converted[i] = Res.take();<br>
       }<br>
       InitListExpr *Semantic = new (S.Context)<br>
<br>
Modified: cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp?rev=182624&r1=182623&r2=182624&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp?rev=182624&r1=182623&r2=182624&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp Thu May 23 18:20:04 2013<br>
@@ -208,3 +208,13 @@ namespace init_list_deduction_failure {<br>
   void h() { g({f}); }<br>
   // expected-error@-1 {{no matching function for call to 'g'}}<br>
 }<br>
+<br>
+namespace deleted_copy {<br>
+  struct X {<br>
+    X(int i) {}<br>
+    X(const X& x) = delete; // expected-note {{here}}<br>
+    void operator=(const X& x) = delete;<br>
+  };<br>
+<br>
+  std::initializer_list<X> x{1}; // expected-error {{invokes deleted constructor}}<br>
+}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br>