diff options
| author | Steve Naroff <snaroff@apple.com> | 2009-04-16 19:02:57 +0000 |
|---|---|---|
| committer | Steve Naroff <snaroff@apple.com> | 2009-04-16 19:02:57 +0000 |
| commit | 3aaa482ea5b8d20b705f6ac8573b539be88d273a (patch) | |
| tree | ba6534ed1bb56aabc0dd40c7e8cc2a89b21f595d /lib/AST/ExprConstant.cpp | |
| parent | 1e9aef31545b2312ddfc5ac2593ad8e48754e2c6 (diff) | |
Fix <rdar://problem/6765383> clang-6: clang does not appear to support declaring a static Block 'const'.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69306 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/ExprConstant.cpp')
| -rw-r--r-- | lib/AST/ExprConstant.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 327fff0c0b..8fd75f1808 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -156,6 +156,7 @@ public: APValue VisitParenExpr(ParenExpr *E) { return Visit(E->getSubExpr()); } APValue VisitDeclRefExpr(DeclRefExpr *E); + APValue VisitBlockExpr(BlockExpr *E); APValue VisitPredefinedExpr(PredefinedExpr *E) { return APValue(E, 0); } APValue VisitCompoundLiteralExpr(CompoundLiteralExpr *E); APValue VisitMemberExpr(MemberExpr *E); @@ -184,6 +185,14 @@ APValue LValueExprEvaluator::VisitDeclRefExpr(DeclRefExpr *E) return APValue(E, 0); } +APValue LValueExprEvaluator::VisitBlockExpr(BlockExpr *E) +{ + if (E->hasBlockDeclRefExprs()) + return APValue(); + + return APValue(E, 0); +} + APValue LValueExprEvaluator::VisitCompoundLiteralExpr(CompoundLiteralExpr *E) { if (E->isFileScope()) return APValue(E, 0); @@ -373,6 +382,7 @@ APValue PointerExprEvaluator::VisitCastExpr(const CastExpr* E) { } if (SubExpr->getType()->isFunctionType() || + SubExpr->getType()->isBlockPointerType() || SubExpr->getType()->isArrayType()) { APValue Result; if (EvaluateLValue(SubExpr, Result, Info)) |