Remove getIntegerConstantExprValue in favor of using EvaluateAsInt.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70145 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index faab3cf..ae3c267 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -3085,7 +3085,7 @@
LastFieldBitfield);
Expr *BitWidth = LastFieldBitfield->getBitWidth();
uint64_t BitFieldSize =
- BitWidth->getIntegerConstantExprValue(CGM.getContext()).getZExtValue();
+ BitWidth->EvaluateAsInt(CGM.getContext()).getZExtValue();
skivar.ivar_size = (BitFieldSize / ByteSizeInBits)
+ ((BitFieldSize % ByteSizeInBits) != 0);
SkipIvars.push_back(skivar);
@@ -4293,7 +4293,7 @@
if (Last->isBitField()) {
Expr *BitWidth = Last->getBitWidth();
uint64_t BitFieldSize =
- BitWidth->getIntegerConstantExprValue(CGM.getContext()).getZExtValue();
+ BitWidth->EvaluateAsInt(CGM.getContext()).getZExtValue();
Size = (BitFieldSize / 8) + ((BitFieldSize % 8) != 0);
}
#endif