summaryrefslogtreecommitdiffstats
path: root/clang/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
commitdd78544d4474154fa8ee097aed3d6c5b2dff72f5 (patch)
tree348f84a4812c8babf47713f85a3fccafc7d5e15e /clang/lib/AST/ExprConstant.cpp
parent4f8e86979a7ffe0e02c2c9afacdc75c83f52ee88 (diff)
downloadbcm5719-llvm-dd78544d4474154fa8ee097aed3d6c5b2dff72f5.tar.gz
bcm5719-llvm-dd78544d4474154fa8ee097aed3d6c5b2dff72f5.zip
Refactoring and test for r143360. Support for array rvalue to pointer decay is
needed for C++11, and will follow later. llvm-svn: 143363
Diffstat (limited to 'clang/lib/AST/ExprConstant.cpp')
-rw-r--r--clang/lib/AST/ExprConstant.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index a12beb51792..b34b59d9079 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/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);
OpenPOWER on IntegriCloud