diff options
author | Eric Fiselier <eric@efcs.ca> | 2017-04-18 05:08:08 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2017-04-18 05:08:08 +0000 |
commit | c9c54dd9e8707fd564dd2c3c8fe9d3764f120da0 (patch) | |
tree | 6925d1d54b5735fc714445d2200de52d62582462 /lib/Sema/SemaCoroutine.cpp | |
parent | be42922df5c37b5707852b64de120f52c3f8c1a9 (diff) | |
download | clang-c9c54dd9e8707fd564dd2c3c8fe9d3764f120da0.tar.gz |
Speculatively attempt to fix bot failures caused by recent coroutine changes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@300528 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaCoroutine.cpp')
-rw-r--r-- | lib/Sema/SemaCoroutine.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/Sema/SemaCoroutine.cpp b/lib/Sema/SemaCoroutine.cpp index f891365efd..6d8f4fac01 100644 --- a/lib/Sema/SemaCoroutine.cpp +++ b/lib/Sema/SemaCoroutine.cpp @@ -888,7 +888,7 @@ bool CoroutineStmtBuilder::makeNewAndDeleteExpr() { FunctionDecl *OperatorDelete = nullptr; FunctionDecl *UnusedResult = nullptr; bool PassAlignment = false; - MultiExprArg PlacementArgs = None; + SmallVector<Expr *, 1> PlacementArgs; S.FindAllocationFunctions(Loc, SourceRange(), /*UseGlobal*/ false, PromiseType, @@ -904,7 +904,7 @@ bool CoroutineStmtBuilder::makeNewAndDeleteExpr() { auto *StdNoThrow = buildStdNoThrowDeclRef(S, Loc); if (!StdNoThrow) return false; - PlacementArgs = MultiExprArg(StdNoThrow); + PlacementArgs = {StdNoThrow}; OperatorNew = nullptr; S.FindAllocationFunctions(Loc, SourceRange(), /*UseGlobal*/ true, PromiseType, @@ -924,6 +924,9 @@ bool CoroutineStmtBuilder::makeNewAndDeleteExpr() { } } + // FIXME: Diagnose and handle the case where no matching operator new is found + // (ie OperatorNew == nullptr) + if ((OperatorDelete = findDeleteForPromise(S, Loc, PromiseType)) == nullptr) return false; @@ -940,7 +943,7 @@ bool CoroutineStmtBuilder::makeNewAndDeleteExpr() { if (NewRef.isInvalid()) return false; - SmallVector<Expr *, 2> NewArgs{FrameSize}; + SmallVector<Expr *, 2> NewArgs(1, FrameSize); for (auto Arg : PlacementArgs) NewArgs.push_back(Arg); |