From 8dbf1dbdb8c1343e1b255fc35888330dcff9e607 Mon Sep 17 00:00:00 2001
From: Mike Stump <mrs@apple.com>
Date: Wed, 18 Feb 2009 21:44:49 +0000
Subject: [PATCH] Codegen for int (^bp)(int) = 0;

llvm-svn: 64951
---
 clang/lib/AST/ExprConstant.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index ccea646fb787..ee698d6c93fb 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -265,7 +265,8 @@ public:
 } // end anonymous namespace
 
 static bool EvaluatePointer(const Expr* E, APValue& Result, EvalInfo &Info) {
-  if (!E->getType()->isPointerType())
+  if (!E->getType()->isPointerType()
+      && !E->getType()->isBlockPointerType())
     return false;
   Result = PointerExprEvaluator(Info).Visit(const_cast<Expr*>(E));
   return Result.isLValue();
@@ -1533,7 +1534,8 @@ bool Expr::Evaluate(EvalResult &Result, ASTContext &Ctx) const {
       return false;
     
     Result.Val = APValue(sInt);
-  } else if (getType()->isPointerType()) {
+  } else if (getType()->isPointerType()
+             || getType()->isBlockPointerType()) {
     if (!EvaluatePointer(this, Result.Val, Info))
       return false;
   } else if (getType()->isRealFloatingType()) {