2 files changed, 4 insertions, 4 deletions
diff --git a/AST/Expr.cpp b/AST/Expr.cpp
index 22767053db..08325fe3a4 100644
--- a/AST/Expr.cpp
+++ b/AST/Expr.cpp
@@ -1028,10 +1028,10 @@ Stmt::child_iterator ParenExpr::child_end() {
 
 // UnaryOperator
 Stmt::child_iterator UnaryOperator::child_begin() {
-  return reinterpret_cast<Stmt**>(&Val);
+  return child_iterator(reinterpret_cast<Stmt**>(&Val),Opc==SizeOf);
 }
 Stmt::child_iterator UnaryOperator::child_end() {
-  return reinterpret_cast<Stmt**>(&Val)+1;
+  return child_iterator(reinterpret_cast<Stmt**>(&Val)+1,Opc==SizeOf);
 }
 
 // SizeOfAlignOfTypeExpr
diff --git a/AST/StmtIterator.cpp b/AST/StmtIterator.cpp
index 94a539770f..b72e9168ed 100644
--- a/AST/StmtIterator.cpp
+++ b/AST/StmtIterator.cpp
@@ -49,7 +49,7 @@ void StmtIteratorBase::NextVA() {
 }
 
 void StmtIteratorBase::NextDecl(bool ImmediateAdvance) {
-  assert (inDeclMode());
+  assert (inDecl());
   assert (getVAPtr() == NULL);
   assert (decl);
   
@@ -97,7 +97,7 @@ StmtIteratorBase::StmtIteratorBase(ScopedDecl* d)
 }
 
 StmtIteratorBase::StmtIteratorBase(VariableArrayType* t)
-: decl(NULL), RawVAPtr(VASizeMode) {
+: decl(NULL), RawVAPtr(SizeOfTypeVAMode) {
   RawVAPtr |= reinterpret_cast<uintptr_t>(t);
 }