Fixed bug in child_begin/child_end for ReturnStmt where the iterator
would be invalid when RetValExp == NULL.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41511 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/AST/Stmt.cpp b/AST/Stmt.cpp
index 4aca7a4..c74e1a8 100644
--- a/AST/Stmt.cpp
+++ b/AST/Stmt.cpp
@@ -145,9 +145,13 @@
Stmt::child_iterator BreakStmt::child_end() { return NULL; }
// ReturnStmt
-Stmt::child_iterator ReturnStmt::child_begin() {
- return reinterpret_cast<Stmt**>(&RetExpr);
+Stmt::child_iterator ReturnStmt::child_begin() {
+ if (RetExpr) return reinterpret_cast<Stmt**>(&RetExpr);
+ else return NULL;
}
-Stmt::child_iterator ReturnStmt::child_end() { return child_begin()+1; }
+Stmt::child_iterator ReturnStmt::child_end() {
+ if (RetExpr) return reinterpret_cast<Stmt**>(&RetExpr)+1;
+ else return NULL;
+}