commit cd09065ec399e21132c00d4d5efb54fdf4481740
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 bf2ccc87e76de89cbbe7fa7a3da71385b83d27f8
parent 48143175160033fa388a7bf612a7aae86d9aeef7

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

llvm-svn: 182624

clang/lib/Sema/SemaInit.cpp

diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index f7b53b2..fdb8777 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/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)