diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 0ac896c..4f2d47e 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1117,8 +1117,10 @@
       if (VD->hasGlobalStorage())
         return true;
       QualType T = VD->getType();
-      // dereferencing to a pointer is always a gc'able candidate
-      return T->isPointerType();
+      // dereferencing to a  pointer is always a gc'able candidate,
+      // unless it is __weak.
+      return T->isPointerType() && 
+             (Ctx.getObjCGCAttrKind(T) != QualType::Weak);
     }
     return false;
   }
diff --git a/test/CodeGenObjC/objc2-weak-assign.m b/test/CodeGenObjC/objc2-weak-assign.m
index a3740b2..635ca38 100644
--- a/test/CodeGenObjC/objc2-weak-assign.m
+++ b/test/CodeGenObjC/objc2-weak-assign.m
@@ -9,6 +9,10 @@
 id* __weak a2[30];
 id** __weak a3[40];
 
+void foo (__weak id *param) {
+ *param = 0;
+}
+
 int main()
 {
 	*x = 0;