Make sizeof and __alignof work correctly with packed structs.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47202 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/AST/Expr.cpp b/AST/Expr.cpp
index b8c564e..0410e28 100644
--- a/AST/Expr.cpp
+++ b/AST/Expr.cpp
@@ -784,16 +784,18 @@
if (Exp->getArgumentType()->isFunctionType()) {
// GCC extension: sizeof(function) = 1.
Result = Exp->isSizeOf() ? 1 : 4;
- } else if (Exp->isSizeOf()) {
+ } else {
unsigned CharSize =
Ctx.Target.getCharWidth(Ctx.getFullLoc(Exp->getOperatorLoc()));
- Result = Ctx.getTypeSize(Exp->getArgumentType(),
- Exp->getOperatorLoc()) / CharSize;
+ if (Exp->isSizeOf())
+ Result = Ctx.getTypeSize(Exp->getArgumentType(),
+ Exp->getOperatorLoc()) / CharSize;
+ else
+ Result = Ctx.getTypeAlign(Exp->getArgumentType(),
+ Exp->getOperatorLoc()) / CharSize;
}
- else
- Result = Ctx.getTypeAlign(Exp->getArgumentType(), Exp->getOperatorLoc());
-
+
break;
}
case BinaryOperatorClass: {