commit 2c2f09ec4842be9933f803b1ec9488b62afc9f5c
author Richard Smith <richard-llvm@metafoo.co.uk> Thu May 23 23:20:04 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu May 23 23:20:04 2013 +0000
tree 05c363004fa5d24c425b73914da2af12a5bf8cd3
parent d5dcdb2658c5aa4568c61917a1620434b055c113

Fix crash-on-invalid if list-initialization works, but we bail out when
building the resulting expression because it invokes a deleted constructor.


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

lib/Sema/SemaInit.cpp

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index f7b53b2..fdb8777 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -5745,7 +5745,8 @@
         ExprResult Res = S.PerformCopyInitialization(
                              Element, Init.get()->getExprLoc(), Init,
                              /*TopLevelOfInitList=*/ true);
-        assert(!Res.isInvalid() && "Result changed since try phase.");
+        if (Res.isInvalid())
+          return ExprError();
         Converted[i] = Res.take();
       }
       InitListExpr *Semantic = new (S.Context)