Add ExplicitCastExpr to replace the current CastExpr, and have ImplicitCastExpr and ExplicitCastExpr derive from a common base class (CastExpr):
Expr
-> CastExpr
-> ExplicitCastExpr
-> ImplicitCastExpr
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54955 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 906255e..5a1ad50 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -946,7 +946,7 @@
diag::err_init_element_not_constant, Init->getSourceRange());
return true;
}
- case Expr::CastExprClass: {
+ case Expr::ExplicitCastExprClass: {
const Expr* SubExpr = cast<CastExpr>(Init)->getSubExpr();
// Check for pointer->pointer cast
@@ -1058,7 +1058,7 @@
// if we don't, we'll figure it out later
return 0;
}
- case Expr::CastExprClass: {
+ case Expr::ExplicitCastExprClass: {
const Expr* SubExpr = cast<CastExpr>(E)->getSubExpr();
// Check for pointer->pointer cast
@@ -1183,14 +1183,8 @@
return true;
}
case Expr::ImplicitCastExprClass:
- case Expr::CastExprClass: {
- const Expr *SubExpr;
- if (const CastExpr *C = dyn_cast<CastExpr>(Init)) {
- SubExpr = C->getSubExpr();
- } else {
- SubExpr = cast<ImplicitCastExpr>(Init)->getSubExpr();
- }
-
+ case Expr::ExplicitCastExprClass: {
+ const Expr *SubExpr = cast<CastExpr>(Init)->getSubExpr();
if (SubExpr->getType()->isArithmeticType())
return CheckArithmeticConstantExpression(SubExpr);
@@ -1267,9 +1261,7 @@
}
} else if (InitTy->isIntegralType()) {
Expr* SubE = 0;
- if (ImplicitCastExpr* ICE = dyn_cast<ImplicitCastExpr>(Init))
- SubE = ICE->getSubExpr();
- else if (CastExpr* CE = dyn_cast<CastExpr>(Init))
+ if (CastExpr* CE = dyn_cast<CastExpr>(Init))
SubE = CE->getSubExpr();
// Special check for pointer cast to int; we allow as an extension
// an address constant cast to an integer if the integer