emit diagnostic when casting a ptr to a small int when doing static initialization (addresses Eli's comments I believe)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63562 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 21fe6e1..d2140b2 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2055,14 +2055,23 @@
}
case Expr::ImplicitCastExprClass:
case Expr::CStyleCastExprClass: {
- const Expr *SubExpr = cast<CastExpr>(Init)->getSubExpr();
+ const CastExpr *CE = cast<CastExpr>(Init);
+ const Expr *SubExpr = CE->getSubExpr();
+
if (SubExpr->getType()->isArithmeticType())
return CheckArithmeticConstantExpression(SubExpr);
if (SubExpr->getType()->isPointerType()) {
const Expr* Base = FindExpressionBaseAddress(SubExpr);
- // If the pointer has a null base, this is an offsetof-like construct
- return Base ? false : CheckAddressConstantExpression(SubExpr);
+ if (Base) {
+ // the cast is only valid if done to a wide enough type
+ if (Context.getTypeSize(CE->getType()) >=
+ Context.getTypeSize(SubExpr->getType()))
+ return false;
+ } else {
+ // If the pointer has a null base, this is an offsetof-like construct
+ return CheckAddressConstantExpression(SubExpr);
+ }
}
InitializerElementNotConstant(Init);