commit dd78544d4474154fa8ee097aed3d6c5b2dff72f5
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Oct 31 20:57:44 2011 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Oct 31 20:57:44 2011 +0000
tree 348f84a4812c8babf47713f85a3fccafc7d5e15e
parent 4f8e86979a7ffe0e02c2c9afacdc75c83f52ee88

Refactoring and test for r143360. Support for array rvalue to pointer decay is
needed for C++11, and will follow later.

llvm-svn: 143363

clang/lib/AST/ExprConstant.cpp

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index a12beb5..b34b59d 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -1222,10 +1222,13 @@
     }
   }
   case CK_ArrayToPointerDecay:
+    // FIXME: Support array-to-pointer decay on array rvalues.
+    if (!SubExpr->isGLValue())
+      return Error(E);
+    return EvaluateLValue(SubExpr, Result, Info);
+
   case CK_FunctionToPointerDecay:
-    if (SubExpr->isGLValue() || SubExpr->getType()->isFunctionType())
-      return EvaluateLValue(SubExpr, Result, Info);
-    return Error(E);
+    return EvaluateLValue(SubExpr, Result, Info);
   }
 
   return ExprEvaluatorBaseTy::VisitCastExpr(E);