Reverting patch rL323952 due to build errors that I
haven't encountered in local builds.

llvm-svn: 323956
diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp
index d60b5fb..5f73d4c 100644
--- a/clang/lib/CodeGen/CGBlocks.cpp
+++ b/clang/lib/CodeGen/CGBlocks.cpp
@@ -1479,8 +1479,8 @@
         const CGBlockInfo::Capture &capture = blockInfo.getCapture(variable);
         if (capture.isConstant()) {
           auto addr = LocalDeclMap.find(variable)->second;
-          (void)DI->EmitDeclareOfAutoVariable(variable, addr.getPointer(),
-                                              Builder);
+          DI->EmitDeclareOfAutoVariable(variable, addr.getPointer(),
+                                        Builder);
           continue;
         }