Place the GC attribute on the same relative pointer

position to make it consistant and to match gcc's behavior,
by placing it at the inner-most pointer.

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

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 3b405267e8de72d0dffd601861adc64f20e12147..b36d1f3dbfa37011201039e1fd18c5a830bf378f 100644 (file)
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -828,6 +828,13 @@ QualType ASTContext::getObjCGCQualType(QualType T,
   if (CanT.getObjCGCAttr() == GCAttr)
     return T;
   
+  if (T->isPointerType()) {
+    QualType Pointee = T->getAsPointerType()->getPointeeType();
+    if (Pointee->isPointerType()) {
+      QualType ResultType = getObjCGCQualType(Pointee, GCAttr);
+      return getPointerType(ResultType);
+    }
+  }
   // If we are composing extended qualifiers together, merge together into one
   // ExtQualType node.
   unsigned CVRQuals = T.getCVRQualifiers();

diff --git a/test/CodeGenObjC/objc2-weak-assign.m b/test/CodeGenObjC/objc2-weak-assign.m
new file mode 100644 (file)
index 0000000..a3740b2
--- /dev/null
+++ b/test/CodeGenObjC/objc2-weak-assign.m
@@ -0,0 +1,22 @@
+// RUN: clang-cc -triple x86_64-apple-darwin9 -fobjc-gc -emit-llvm -o %t %s &&
+// RUN: grep -e "objc_assign_weak" %t | grep -e "call" | count 6
+
+__weak id* x;
+id* __weak y;
+id* __weak* z;
+
+__weak id* a1[20];
+id* __weak a2[30];
+id** __weak a3[40];
+
+int main()
+{
+       *x = 0;
+       *y = 0;
+        **z = 0;
+
+        a1[3] = 0;
+        a2[3] = 0;
+        a3[3][4] = 0;
+}
+