CodeGen support for copied BlockDeclRefExprs.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65487 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 4a2fe99..020c21f 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -607,11 +607,7 @@
     return VisitExpr(E);
   }
 
-  // FIXME: We have most of the easy codegen for the helper, but we need to
-  // ensure we don't need copy/dispose, and we need to add the variables into
-  // the block literal still.
-  CGF.ErrorUnsupported(E, "scalar expression");
-
+  // FIXME: ensure we don't need copy/dispose.
   uint64_t &offset = CGF.BlockDecls[E->getDecl()];
 
   const llvm::Type *Ty;
@@ -1389,8 +1385,8 @@
 }
 
 Value *ScalarExprEmitter::VisitBlockExpr(const BlockExpr *BE) {
-  llvm::Constant *C = CGF.BuildBlockLiteralTmp(BE);
-  return C;
+  llvm::Value *V = CGF.BuildBlockLiteralTmp(BE);
+  return V;
 }
 
 //===----------------------------------------------------------------------===//