Switch some random local-decl cleanups over to using lazy cleanups.  Turn on
the block-release unwind cleanup:  we're never going to test it if we don't turn
it on.

llvm-svn: 108992
diff --git a/clang/test/CodeGen/block-decl-merging.c b/clang/test/CodeGen/block-decl-merging.c
index 5a3d95b..1e7a9f4 100644
--- a/clang/test/CodeGen/block-decl-merging.c
+++ b/clang/test/CodeGen/block-decl-merging.c
@@ -5,10 +5,10 @@
 extern void * _NSConcreteStackBlock[32] __attribute__((weak_import));
 // CHECK: @_NSConcreteStackBlock = extern_weak global
 extern void * _NSConcreteGlobalBlock[32] __attribute__((weak_import));
-// CHECK: declare extern_weak void @_Block_object_dispose
 extern void _Block_object_dispose(const void *, const int) __attribute__((weak_import));
 // CHECK: declare extern_weak void @_Block_object_assign
 extern void _Block_object_assign(void *, const void *, const int) __attribute__((weak_import));
+// CHECK: declare extern_weak void @_Block_object_dispose
 
 void *x = ^(){};