From 1c9c3fd50a05147d9e14d12bb42910eda831a373 Mon Sep 17 00:00:00 2001
From: John McCall <rjmccall@apple.com>
Date: Fri, 15 Oct 2010 04:57:14 +0000
Subject: Death to blocks, or at least the word "block" in one particular
 obnoxiously ambiguous context.

llvm-svn: 116567
---
 clang/lib/CodeGen/CGExpr.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'clang/lib/CodeGen/CGExpr.cpp')

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 5b695cd52c3..d45cd2ad63b 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -1064,8 +1064,7 @@ static void setObjCGCLValueClass(const ASTContext &Ctx, const Expr *E,
   
   if (const DeclRefExpr *Exp = dyn_cast<DeclRefExpr>(E)) {
     if (const VarDecl *VD = dyn_cast<VarDecl>(Exp->getDecl())) {
-      if ((VD->isBlockVarDecl() && !VD->hasLocalStorage()) ||
-          VD->isFileVarDecl()) {
+      if (VD->hasGlobalStorage()) {
         LV.setGlobalObjCRef(true);
         LV.setThreadLocalRef(VD->isThreadSpecified());
       }
-- 
cgit v1.2.3