modern objc translator: used size_t in couple

of places. // rdar://11375908

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156106 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/RewriteModernObjC.cpp
index 3863d48374bf415385466e684a2c4b67a3c9e6dd..6330f671e2115ca28a6338de1c3aa22d353a64e3 100644 (file)
--- a/lib/Rewrite/RewriteModernObjC.cpp
+++ b/lib/Rewrite/RewriteModernObjC.cpp
@@ -4053,8 +4053,8 @@ std::string RewriteModernObjC::SynthesizeBlockDescriptor(std::string DescTag,
                                                    unsigned hasCopy) {
   std::string S = "\nstatic struct " + DescTag;
   
-  S += " {\n  unsigned long reserved;\n";
-  S += "  unsigned long Block_size;\n";
+  S += " {\n  size_t reserved;\n";
+  S += "  size_t Block_size;\n";
   if (hasCopy) {
     S += "  void (*copy)(struct ";
     S += ImplTag; S += "*, struct ";

diff --git a/test/Rewriter/objc-bool-literal-modern-1.mm b/test/Rewriter/objc-bool-literal-modern-1.mm
index 782517242e52d61a0f350b8dd8711203d49f078b..7aaa79b1e943fb8492e435fcb1b5833ca32c17d3 100644 (file)
--- a/test/Rewriter/objc-bool-literal-modern-1.mm
+++ b/test/Rewriter/objc-bool-literal-modern-1.mm
@@ -2,6 +2,9 @@
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"__declspec(X)=" %t-rw.cpp
 // rdar://11231426
 
+// rdar://11375908
+typedef unsigned long size_t;
+
 typedef bool BOOL;
 
 BOOL yes() {

diff --git a/test/Rewriter/rewrite-block-literal-1.mm b/test/Rewriter/rewrite-block-literal-1.mm
index f152117443a72adbc83010a283e18a5d6de85034..c1b8bcc9a13ad18c6c57fa0d3656feb0a6a1b8b0 100644 (file)
--- a/test/Rewriter/rewrite-block-literal-1.mm
+++ b/test/Rewriter/rewrite-block-literal-1.mm
@@ -5,6 +5,9 @@
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -Did="void *" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
 // rdar://11259664
 
+// rdar://11375908
+typedef unsigned long size_t;
+
 void *sel_registerName(const char *);
 typedef void (^BLOCK_TYPE)(void);
 

diff --git a/test/Rewriter/rewrite-block-literal.mm b/test/Rewriter/rewrite-block-literal.mm
index 083312e79dd7e31aadd62d6e8dbb8da910b939f3..f941e656e7481c60d9c674dac6fff24f7cc7e948 100644 (file)
--- a/test/Rewriter/rewrite-block-literal.mm
+++ b/test/Rewriter/rewrite-block-literal.mm
@@ -5,6 +5,9 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
 
+// rdar://11375908
+typedef unsigned long size_t;
+
 // rdar: // 11006566
 
 void I( void (^)(void));

diff --git a/test/Rewriter/rewrite-block-pointer.mm b/test/Rewriter/rewrite-block-pointer.mm
index 58407a7ac5cf68ba69b94c7371d673e8965e838f..1738c3e43bcd6acf3a2ec54fd4b5d106f8617fc3 100644 (file)
--- a/test/Rewriter/rewrite-block-pointer.mm
+++ b/test/Rewriter/rewrite-block-pointer.mm
@@ -4,6 +4,9 @@
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
 // radar 7638400
 
+// rdar://11375908
+typedef unsigned long size_t;
+
 typedef void * id;
 void *sel_registerName(const char *);
 

diff --git a/test/Rewriter/rewrite-byref-in-nested-blocks.mm b/test/Rewriter/rewrite-byref-in-nested-blocks.mm
index 1583945b2c91b75482240045c3fa23b380876279..15b910734217aeac6ac46d3e689578d9ac0bcefc 100644 (file)
--- a/test/Rewriter/rewrite-byref-in-nested-blocks.mm
+++ b/test/Rewriter/rewrite-byref-in-nested-blocks.mm
@@ -4,6 +4,9 @@
 // RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"SEL=void*" -U__declspec  -D"__declspec(X)=" %t-modern-rw.cpp
 // radar 7692350
 
+// rdar://11375908
+typedef unsigned long size_t;
+
 void f(void (^block)(void));
 
 @interface X {

diff --git a/test/Rewriter/rewrite-foreach-in-block.mm b/test/Rewriter/rewrite-foreach-in-block.mm
index fd34212d672e6a4314653f2f228340f7cc1ef5d4..4fadd33695f2def03e9b64e83457675120ca6244 100644 (file)
--- a/test/Rewriter/rewrite-foreach-in-block.mm
+++ b/test/Rewriter/rewrite-foreach-in-block.mm
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
 // rdar:// 9878420
 
+typedef unsigned long size_t;
+
 void objc_enumerationMutation(id);
 void *sel_registerName(const char *);
 typedef void (^CoreDAVCompletionBlock)(void);

diff --git a/test/Rewriter/rewrite-modern-block-consts.mm b/test/Rewriter/rewrite-modern-block-consts.mm
index 7ff39a58c379cfab33476db6c4c2eb786b051cdc..48c8d4023d310c1f610ab12b405bb05321d63264 100644 (file)
--- a/test/Rewriter/rewrite-modern-block-consts.mm
+++ b/test/Rewriter/rewrite-modern-block-consts.mm
@@ -2,6 +2,9 @@
 // RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -U__declspec -D"__declspec(X)=" %t-modern-rw.cpp
 // rdar:// 8243071
 
+// rdar://11375908
+typedef unsigned long size_t;
+
 void x(int y) {}
 void f() {
     const int bar = 3;

diff --git a/test/Rewriter/rewrite-modern-block.mm b/test/Rewriter/rewrite-modern-block.mm
index cc9710efe9344c3479d9b810b85c2c0525441018..23029654c984fa3e83a75d7a54b71ca1ec08ad41 100644 (file)
--- a/test/Rewriter/rewrite-modern-block.mm
+++ b/test/Rewriter/rewrite-modern-block.mm
@@ -2,6 +2,7 @@
 // RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
 // rdar://11230308
 
+typedef unsigned long size_t;
 typedef struct {
     char byte0;
     char byte1;

diff --git a/test/Rewriter/rewrite-modern-extern-c-func-decl.mm b/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
index 16d236a270a9e8ae6c4628f28507e56ce776a741..c3bfec9e228cdb6d417821e817a4763d18043c7e 100644 (file)
--- a/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
+++ b/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
@@ -2,6 +2,7 @@
 // RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-attributes -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
 // rdar://11131490
 
+typedef unsigned long size_t;
 extern "C" __declspec(dllexport) void BreakTheRewriter(void) {
         __block int aBlockVariable = 0;
         void (^aBlock)(void) = ^ {

diff --git a/test/Rewriter/rewrite-modern-typeof.mm b/test/Rewriter/rewrite-modern-typeof.mm
index 4650ab7b7f30456aebcc7c800e779c9cd3e9db13..a493c11849672a2464c8a8b80e48c58722c16f1b 100644 (file)
--- a/test/Rewriter/rewrite-modern-typeof.mm
+++ b/test/Rewriter/rewrite-modern-typeof.mm
@@ -2,6 +2,7 @@
 // RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -Wno-attributes -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 
+typedef unsigned long size_t;
 extern "C" {
 extern "C" void *_Block_copy(const void *aBlock);
 extern "C" void _Block_release(const void *aBlock);

diff --git a/test/Rewriter/rewrite-nested-blocks-1.mm b/test/Rewriter/rewrite-nested-blocks-1.mm
index 25b17cfce179ca7ad5ec37695802f4dfd6f59f6f..cfd6fadffcdfcfb8b3c1b875d9faf9b7a3b4ac70 100644 (file)
--- a/test/Rewriter/rewrite-nested-blocks-1.mm
+++ b/test/Rewriter/rewrite-nested-blocks-1.mm
@@ -4,6 +4,7 @@
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
 // radar 7696893
 
+typedef unsigned long size_t;
 void *sel_registerName(const char *);
 
 void f(void (^block)(void));

diff --git a/test/Rewriter/rewrite-nested-blocks-2.mm b/test/Rewriter/rewrite-nested-blocks-2.mm
index d1513f3a5fa021f77dd886d390b10ad5eae32e9e..350e62af14468ee02a159b16afe39ebcc2300af8 100644 (file)
--- a/test/Rewriter/rewrite-nested-blocks-2.mm
+++ b/test/Rewriter/rewrite-nested-blocks-2.mm
@@ -6,6 +6,7 @@
 // grep "static void __FUNC_block_copy_" %t-modern-rw.cpp | count 2
 // rdar://8499592
 
+typedef unsigned long size_t;
 void Outer(void (^bk)());
 void Inner(void (^bk)());
 void INNER_FUNC(id d);

diff --git a/test/Rewriter/rewrite-nested-blocks.mm b/test/Rewriter/rewrite-nested-blocks.mm
index d492afa18d49ffb7a44b208e0a368d8d4b9e05fb..89377be748f80f1ffb8589530919b84e49713552 100644 (file)
--- a/test/Rewriter/rewrite-nested-blocks.mm
+++ b/test/Rewriter/rewrite-nested-blocks.mm
@@ -5,6 +5,7 @@
 // radar 7682149
 
 
+typedef unsigned long size_t;
 void f(void (^block)(void));
 
 @interface X {

diff --git a/test/Rewriter/rewrite-nested-property-in-blocks.mm b/test/Rewriter/rewrite-nested-property-in-blocks.mm
index 7f9361ed0788dfdc2075344ec90d59a33e2484e6..0c7af231bfbb8d73673a8639319ee26b6ffd2174 100755 (executable)
--- a/test/Rewriter/rewrite-nested-property-in-blocks.mm
+++ b/test/Rewriter/rewrite-nested-property-in-blocks.mm
@@ -4,6 +4,7 @@
 // RUN: %clang_cc1 -fsyntax-only -fms-extensions -Wno-address-of-temporary -Did="void *" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
 // radar 8608293
 
+typedef unsigned long size_t;
 void *sel_registerName(const char *);
 
 extern "C" void nowarn(id);

diff --git a/test/Rewriter/rewrite-rewritten-initializer.mm b/test/Rewriter/rewrite-rewritten-initializer.mm
index b73d3e952e138698db34dcf098e411fd2fd6c4fa..9a86fe53314ad1eb12d5aec42de16adeffad7189 100644 (file)
--- a/test/Rewriter/rewrite-rewritten-initializer.mm
+++ b/test/Rewriter/rewrite-rewritten-initializer.mm
@@ -4,6 +4,7 @@
 // RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw-modern.cpp
 // radar 7669784
 
+typedef unsigned long size_t;
 typedef void * id;
 void *sel_registerName(const char *);
 

diff --git a/test/Rewriter/rewrite-unique-block-api.mm b/test/Rewriter/rewrite-unique-block-api.mm
index 1dcc1b67fe7bda7572e1ee44b8a48e182286e110..7d69acecfd4524aac5169a5ecd4e29d323f0b657 100644 (file)
--- a/test/Rewriter/rewrite-unique-block-api.mm
+++ b/test/Rewriter/rewrite-unique-block-api.mm
@@ -4,6 +4,7 @@
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
 // radar 7630551
 
+typedef unsigned long size_t;
 void f(void (^b)(char c));
 
 @interface a