diff options
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 19 | ||||
| -rw-r--r-- | lib/Sema/TreeTransform.h | 3 | ||||
| -rw-r--r-- | test/SemaCXX/short-enums.cpp | 17 |
3 files changed, 27 insertions, 12 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index bc29a4cbdc..3123f5fc67 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -3840,18 +3840,18 @@ Sema::BuildExpressionFromIntegralTemplateArgument(const TemplateArgument &Arg, if (T->isCharType() || T->isWideCharType()) return Owned(new (Context) CharacterLiteral( Arg.getAsIntegral()->getZExtValue(), - T->isWideCharType(), - T, - Loc)); + T->isWideCharType(), T, Loc)); if (T->isBooleanType()) return Owned(new (Context) CXXBoolLiteralExpr( Arg.getAsIntegral()->getBoolValue(), - T, - Loc)); + T, Loc)); + // If this is an enum type that we're instantiating, we need to use an integer + // type the same size as the enumerator. We don't want to build an + // IntegerLiteral with enum type. QualType BT; if (const EnumType *ET = T->getAs<EnumType>()) - BT = ET->getDecl()->getPromotionType(); + BT = ET->getDecl()->getIntegerType(); else BT = T; @@ -3859,10 +3859,9 @@ Sema::BuildExpressionFromIntegralTemplateArgument(const TemplateArgument &Arg, if (T->isEnumeralType()) { // FIXME: This is a hack. We need a better way to handle substituted // non-type template parameters. - E = CStyleCastExpr::Create(Context, T, VK_RValue, CK_IntegralCast, - E, 0, - Context.getTrivialTypeSourceInfo(T, Loc), - Loc, Loc); + E = CStyleCastExpr::Create(Context, T, VK_RValue, CK_IntegralCast, E, 0, + Context.getTrivialTypeSourceInfo(T, Loc), + Loc, Loc); } return Owned(E); diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index c642e642cc..b2aa85e719 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -2819,8 +2819,7 @@ bool TreeTransform<Derived>::TransformTemplateArgument( Expr *InputExpr = Input.getSourceExpression(); if (!InputExpr) InputExpr = Input.getArgument().getAsExpr(); - ExprResult E - = getDerived().TransformExpr(InputExpr); + ExprResult E = getDerived().TransformExpr(InputExpr); if (E.isInvalid()) return true; Output = TemplateArgumentLoc(TemplateArgument(E.take()), E.take()); return false; diff --git a/test/SemaCXX/short-enums.cpp b/test/SemaCXX/short-enums.cpp new file mode 100644 index 0000000000..ca713b7334 --- /dev/null +++ b/test/SemaCXX/short-enums.cpp @@ -0,0 +1,17 @@ +// RUN: %clang_cc1 -fshort-enums -fsyntax-only %s + +// This shouldn't crash: PR9474 + +enum E { VALUE_1 }; + +template <typename T> +struct A {}; + +template <E Enum> +struct B : A<B<Enum> > {}; + +void bar(int x) { + switch (x) { + case sizeof(B<VALUE_1>): ; + } +}
\ No newline at end of file |