Merge branch 'master' of ssh://bitbucket.org/czan/honours

1 files changed, 32 insertions, 0 deletions

diff --git a/clang/test/Rewriter/inner-block-helper-funcs.mm b/clang/test/Rewriter/inner-block-helper-funcs.mm
new file mode 100644
index 0000000..d30e1dc
--- /dev/null
+++ b/clang/test/Rewriter/inner-block-helper-funcs.mm
@@ -0,0 +1,32 @@
+// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-fragile-abi %s -o %t-rw.cpp
+// RUN: FileCheck  -check-prefix LP --input-file=%t-rw.cpp %s
+// rdar://9846759
+
+typedef void (^dispatch_block_t)(void);
+
+extern int printf(const char*, ...);
+
+extern "C" dispatch_block_t Block_copy(dispatch_block_t aBlock);
+
+int main (int argc, char *argv[]) {
+
+  dispatch_block_t innerBlock = ^{printf("argc = %d\n", argc); };
+  id innerObject = 0;
+
+  printf("innerBlock is %x\n", innerBlock);
+
+  dispatch_block_t wrapperBlock = ^{
+    printf("innerBlock is %x %x\n", innerBlock, innerObject);
+  };
+
+  wrapperBlock();
+
+  dispatch_block_t copiedBlock = Block_copy(wrapperBlock);
+  copiedBlock();
+
+  return 0;
+}
+// CHECK-LP: _Block_object_assign((void*)&dst->innerBlock, (void*)src->innerBlock, 7
+// CHECK-LP: _Block_object_dispose((void*)src->innerBlock, 7
+// CHECK-LP: _Block_object_assign((void*)&dst->innerObject, (void*)src->innerObject, 3
+// CHECK-LP: _Block_object_dispose((void*)src->innerObject, 3