diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 4a84e3d..830cc6a 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -2151,7 +2151,8 @@
       }
       S += '@';
       if (FD || EncodingProperty) {
-        const ObjCInterfaceType *OIT = PointeeTy->getAsObjCInterfaceType();
+        const ObjCInterfaceType *OIT = 
+                PointeeTy.getUnqualifiedType()->getAsObjCInterfaceType();
         ObjCInterfaceDecl *OI = OIT->getDecl();
         S += '"';
         S += OI->getNameAsCString();
diff --git a/test/CodeGenObjC/objc2-weak-ivar.m b/test/CodeGenObjC/objc2-weak-ivar.m
new file mode 100644
index 0000000..611bffd
--- /dev/null
+++ b/test/CodeGenObjC/objc2-weak-ivar.m
@@ -0,0 +1,10 @@
+// RUN: clang -triple x86_64-unknown-unknown -fobjc-gc -emit-llvm -o %t %s
+@class NSObject;
+
+@interface Foo  {
+@public
+  __weak NSObject *nsobject;
+}
+@end
+
+@implementation Foo @end