From: Fariborz Jahanian Date: Tue, 12 Jan 2010 18:33:57 +0000 (+0000) Subject: Define __weak attribute for objective-c pointers in X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=453c1349a5dfb581d960df3e1bcd266d6ba68277;p=clang Define __weak attribute for objective-c pointers in win32 targets. Fixes radar 7530235. Daniel please review. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@93246 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index ac13b95075..ef3cf89299 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -994,6 +994,10 @@ public: DefineStd(Builder, "WIN32", Opts); DefineStd(Builder, "WINNT", Opts); Builder.defineMacro("_X86_"); + if (Opts.ObjC1) + // __weak is always defined, for use in blocks and with objc pointers, + // even for i686-pc-win32 targets. + Builder.defineMacro("__weak", "__attribute__((objc_gc(weak)))"); } }; } // end anonymous namespace diff --git a/test/Rewriter/rewrite-weak-attr.m b/test/Rewriter/rewrite-weak-attr.m new file mode 100644 index 0000000000..2e559ee3e3 --- /dev/null +++ b/test/Rewriter/rewrite-weak-attr.m @@ -0,0 +1,13 @@ +// RUN: %clang_cc1 -triple i686-pc-win32 -fms-extensions -fblocks -Dnil=0 -rewrite-objc -o - %s +int main() { + __weak __block id foo = nil; + __block id foo2 = nil; + id foo3 = nil; + + void (^myblock)() = ^{ + foo = nil; + foo2 = nil; + [foo3 bar]; + id foo4 = foo3; + }; +}