commit 4ef685becf2bca9db12e31ace0e79ffd428a5e64
author Richard Smith <richard-llvm@metafoo.co.uk> Tue Jan 17 21:17:26 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue Jan 17 21:17:26 2012 +0000
tree cb46feaf42de2371a57e64873f7634a471ed3493
parent a6607fa84e0a2d7fc5cce307b8f26236ffc385fa

Enable constant evaluation of implicit calls to constexpr conversion operators.

llvm-svn: 148333

clang/lib/AST/ExprConstant.cpp

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 89e8ab7..1ad0bc5 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -2280,6 +2280,7 @@
     case CK_AtomicToNonAtomic:
     case CK_NonAtomicToAtomic:
     case CK_NoOp:
+    case CK_UserDefinedConversion:
       return StmtVisitorTy::Visit(E->getSubExpr());
 
     case CK_LValueToRValue: {
@@ -4525,13 +4526,13 @@
   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: