aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen
diff options
context:
space:
mode:
Diffstat (limited to 'lib/CodeGen')
-rw-r--r--lib/CodeGen/CGExpr.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index a9f87e67d4..511914884f 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -872,8 +872,9 @@ static bool hasBooleanRepresentation(QualType Ty) {
llvm::MDNode *CodeGenFunction::getRangeForLoadFromType(QualType Ty) {
const EnumType *ET = Ty->getAs<EnumType>();
- bool IsRegularCPlusPlusEnum = getLangOpts().CPlusPlus && ET &&
- !ET->getDecl()->isFixed();
+ bool IsRegularCPlusPlusEnum = (getLangOpts().CPlusPlus && ET &&
+ CGM.getCodeGenOpts().StrictEnums &&
+ !ET->getDecl()->isFixed());
bool IsBool = hasBooleanRepresentation(Ty);
llvm::Type *LTy;
if (!IsBool && !IsRegularCPlusPlusEnum)