diff options
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 11 | ||||
| -rw-r--r-- | test/Coverage/cxx-language-features.inc | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index d38bffd9e3..088e0193a5 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -3463,7 +3463,16 @@ Sema::BuildExpressionFromIntegralTemplateArgument(const TemplateArgument &Arg, T, Loc)); - return Owned(IntegerLiteral::Create(Context, *Arg.getAsIntegral(), T, Loc)); + QualType BT; + if (const EnumType *ET = T->getAs<EnumType>()) + BT = ET->getDecl()->getPromotionType(); + else + BT = T; + + Expr *E = IntegerLiteral::Create(Context, *Arg.getAsIntegral(), BT, Loc); + ImpCastExprToType(E, T, CK_IntegralCast); + + return Owned(E); } diff --git a/test/Coverage/cxx-language-features.inc b/test/Coverage/cxx-language-features.inc index 51c11046a8..31b50be335 100644 --- a/test/Coverage/cxx-language-features.inc +++ b/test/Coverage/cxx-language-features.inc @@ -19,3 +19,9 @@ class Base1 { class Base2 { }; class Derived1 : Base1, virtual public Base2 { }; + +/* Template classes, template functions */ +enum E1 { EC1 }; +template <E1 v> class C1 {}; +template <E1 v> C1<v> f1() { return C1<v>(); } +void f2() { f1<EC1>(); } |