1 files changed, 7 insertions, 3 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 93bc53f7b8..565549c91f 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -450,9 +450,13 @@ public:
       return CGM.GetAddrOfConstantCFString(S);
     }
     case Expr::BlockExprClass: {
-      BlockExpr *B = cast<BlockExpr>(E);
-      if (!B->hasBlockDeclRefExprs())
-        return cast<llvm::Constant>(CGF->BuildBlockLiteralTmp(B));
+      std::string FunctionName;
+      if (CGF)
+        FunctionName = CGF->CurFn->getName();
+      else
+        FunctionName = "global";
+
+      return CGM.GetAddrOfGlobalBlock(cast<BlockExpr>(E), FunctionName.c_str());
     }
     }