diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-05-23 23:20:04 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-05-23 23:20:04 +0000 |
| commit | cd09065ec399e21132c00d4d5efb54fdf4481740 (patch) | |
| tree | bf2ccc87e76de89cbbe7fa7a3da71385b83d27f8 /clang/lib/Sema/SemaInit.cpp | |
| parent | 48143175160033fa388a7bf612a7aae86d9aeef7 (diff) | |
| download | bcm5719-llvm-cd09065ec399e21132c00d4d5efb54fdf4481740.tar.gz bcm5719-llvm-cd09065ec399e21132c00d4d5efb54fdf4481740.zip | |
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
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index f7b53b2be21..fdb8777d41e 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -5745,7 +5745,8 @@ InitializationSequence::Perform(Sema &S, 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) |
