aboutsummaryrefslogtreecommitdiff
path: root/lib/AST/ExprConstant.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2011-10-31 20:57:44 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2011-10-31 20:57:44 +0000
commit6a7c94af983717e2c2d6aebe42cb4737c1c7b9e6 (patch)
tree6bf91b80cdb184e81bb3b7d4c606d789529f6ab0 /lib/AST/ExprConstant.cpp
parentaa97b53175ef138144f69dbc7fda6870c5740226 (diff)
Refactoring and test for r143360. Support for array rvalue to pointer decay is
needed for C++11, and will follow later. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143363 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/ExprConstant.cpp')
-rw-r--r--lib/AST/ExprConstant.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index a12beb5179..b34b59d907 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -1222,10 +1222,13 @@ bool PointerExprEvaluator::VisitCastExpr(const CastExpr* E) {
}
}
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);