diff options
| -rw-r--r-- | include/clang/AST/StmtCXX.h | 6 | ||||
| -rw-r--r-- | lib/AST/Stmt.cpp | 13 | ||||
| -rw-r--r-- | lib/Sema/SemaStmt.cpp | 2 |
3 files changed, 9 insertions, 12 deletions
diff --git a/include/clang/AST/StmtCXX.h b/include/clang/AST/StmtCXX.h index 26d53c8cfe..bbb02e59fe 100644 --- a/include/clang/AST/StmtCXX.h +++ b/include/clang/AST/StmtCXX.h @@ -63,8 +63,7 @@ class CXXTryStmt : public Stmt { SourceLocation TryLoc; unsigned NumHandlers; - CXXTryStmt(SourceLocation tryLoc, Stmt *tryBlock, Stmt **handlers, - unsigned numHandlers); + CXXTryStmt(SourceLocation tryLoc, Stmt *tryBlock, ArrayRef<Stmt*> handlers); CXXTryStmt(EmptyShell Empty, unsigned numHandlers) : Stmt(CXXTryStmtClass), NumHandlers(numHandlers) { } @@ -78,8 +77,7 @@ class CXXTryStmt : public Stmt { public: static CXXTryStmt *Create(ASTContext &C, SourceLocation tryLoc, - Stmt *tryBlock, Stmt **handlers, - unsigned numHandlers); + Stmt *tryBlock, ArrayRef<Stmt*> handlers); static CXXTryStmt *Create(ASTContext &C, EmptyShell Empty, unsigned numHandlers); diff --git a/lib/AST/Stmt.cpp b/lib/AST/Stmt.cpp index ac6d224fae..3214a2b23b 100644 --- a/lib/AST/Stmt.cpp +++ b/lib/AST/Stmt.cpp @@ -769,13 +769,12 @@ SourceLocation ObjCAtTryStmt::getLocEnd() const { } CXXTryStmt *CXXTryStmt::Create(ASTContext &C, SourceLocation tryLoc, - Stmt *tryBlock, Stmt **handlers, - unsigned numHandlers) { + Stmt *tryBlock, ArrayRef<Stmt*> handlers) { std::size_t Size = sizeof(CXXTryStmt); - Size += ((numHandlers + 1) * sizeof(Stmt)); + Size += ((handlers.size() + 1) * sizeof(Stmt)); void *Mem = C.Allocate(Size, llvm::alignOf<CXXTryStmt>()); - return new (Mem) CXXTryStmt(tryLoc, tryBlock, handlers, numHandlers); + return new (Mem) CXXTryStmt(tryLoc, tryBlock, handlers); } CXXTryStmt *CXXTryStmt::Create(ASTContext &C, EmptyShell Empty, @@ -788,11 +787,11 @@ CXXTryStmt *CXXTryStmt::Create(ASTContext &C, EmptyShell Empty, } CXXTryStmt::CXXTryStmt(SourceLocation tryLoc, Stmt *tryBlock, - Stmt **handlers, unsigned numHandlers) - : Stmt(CXXTryStmtClass), TryLoc(tryLoc), NumHandlers(numHandlers) { + ArrayRef<Stmt*> handlers) + : Stmt(CXXTryStmtClass), TryLoc(tryLoc), NumHandlers(handlers.size()) { Stmt **Stmts = reinterpret_cast<Stmt **>(this + 1); Stmts[0] = tryBlock; - std::copy(handlers, handlers + NumHandlers, Stmts + 1); + std::copy(handlers.begin(), handlers.end(), Stmts + 1); } CXXForRangeStmt::CXXForRangeStmt(DeclStmt *Range, DeclStmt *BeginEndStmt, diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index df6b8283b7..7a2519a9ed 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -2757,7 +2757,7 @@ Sema::ActOnCXXTryBlock(SourceLocation TryLoc, Stmt *TryBlock, // and warns. return Owned(CXXTryStmt::Create(Context, TryLoc, TryBlock, - Handlers, NumHandlers)); + llvm::makeArrayRef(Handlers, NumHandlers))); } StmtResult |