diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-01-17 21:17:26 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-01-17 21:17:26 +0000 |
commit | 7d580a4e9e47dffc3c17aa2b957ac57ca3c4e451 (patch) | |
tree | d2921ead4eea764d1555a23b2110dfb34789e976 /lib/AST/ExprConstant.cpp | |
parent | a8398ea850fbd9cd4a67d80f59062d309f6462c3 (diff) |
Enable constant evaluation of implicit calls to constexpr conversion operators.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148333 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/ExprConstant.cpp')
-rw-r--r-- | lib/AST/ExprConstant.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 89e8ab768b..1ad0bc5474 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -2280,6 +2280,7 @@ public: case CK_AtomicToNonAtomic: case CK_NonAtomicToAtomic: case CK_NoOp: + case CK_UserDefinedConversion: return StmtVisitorTy::Visit(E->getSubExpr()); case CK_LValueToRValue: { @@ -4525,13 +4526,13 @@ bool IntExprEvaluator::VisitCastExpr(const CastExpr *E) { case CK_BitCast: case CK_Dependent: case CK_LValueBitCast: - case CK_UserDefinedConversion: case CK_ARCProduceObject: case CK_ARCConsumeObject: case CK_ARCReclaimReturnedObject: case CK_ARCExtendBlockObject: return Error(E); + case CK_UserDefinedConversion: case CK_LValueToRValue: case CK_AtomicToNonAtomic: case CK_NonAtomicToAtomic: |