Fix more strict-aliasing warnings.
Fix indentation of class declarations in ExprCXX.h
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@52380 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ExprCXX.cpp b/lib/AST/ExprCXX.cpp
index 323fdd6..6069438 100644
--- a/lib/AST/ExprCXX.cpp
+++ b/lib/AST/ExprCXX.cpp
@@ -20,12 +20,8 @@
// CXXCastExpr
-Stmt::child_iterator CXXCastExpr::child_begin() {
- return reinterpret_cast<Stmt**>(&Op);
-}
-Stmt::child_iterator CXXCastExpr::child_end() {
- return reinterpret_cast<Stmt**>(&Op)+1;
-}
+Stmt::child_iterator CXXCastExpr::child_begin() { return &Op; }
+Stmt::child_iterator CXXCastExpr::child_end() { return &Op+1; }
// CXXBoolLiteralExpr
Stmt::child_iterator CXXBoolLiteralExpr::child_begin() {
@@ -36,14 +32,10 @@
}
// CXXThrowExpr
-Stmt::child_iterator CXXThrowExpr::child_begin() {
- return reinterpret_cast<Stmt**>(&Op);
-}
+Stmt::child_iterator CXXThrowExpr::child_begin() { return &Op; }
Stmt::child_iterator CXXThrowExpr::child_end() {
// If Op is 0, we are processing throw; which has no children.
- if (Op == 0)
- return reinterpret_cast<Stmt**>(&Op)+0;
- return reinterpret_cast<Stmt**>(&Op)+1;
+ return Op ? &Op+1 : &Op;
}
// CXXDefaultArgExpr