Generate objc_read_weak for __weak objc loads.

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

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 993562592b65304ac1822f61e83b96d7080b4713..d537c9ca8137dc841d20bffac722d40bddf603c3 100644 (file)
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -151,6 +151,14 @@ LValue CodeGenFunction::EmitLValue(const Expr *E) {
 /// this method emits the address of the lvalue, then loads the result as an
 /// rvalue, returning the rvalue.
 RValue CodeGenFunction::EmitLoadOfLValue(LValue LV, QualType ExprType) {
+  if (LV.isObjcWeak()) {
+    // load of a __weak object. 
+    llvm::Value *AddrWeakObj = LV.getAddress();
+    llvm::Value *read_weak = CGM.getObjCRuntime().EmitObjCWeakCall(*this, 
+                                                                   AddrWeakObj);
+    return RValue::get(read_weak);
+  }
+      
   if (LV.isSimple()) {
     llvm::Value *Ptr = LV.getAddress();
     const llvm::Type *EltTy =

diff --git a/lib/CodeGen/CGObjCGNU.cpp b/lib/CodeGen/CGObjCGNU.cpp
index 0833b0832d74c8081d8585f6b869ca6af053cb31..d57710c5e5199bac3967e7c419dcad0b1322b205 100644 (file)
--- a/lib/CodeGen/CGObjCGNU.cpp
+++ b/lib/CodeGen/CGObjCGNU.cpp
@@ -130,6 +130,8 @@ public:
                              const ObjCAtThrowStmt &S);
   virtual void EmitSynchronizedStmt(CodeGen::CodeGenFunction &CGF,
                                     const ObjCAtSynchronizedStmt &S);
+  virtual llvm::Value * EmitObjCWeakCall(CodeGen::CodeGenFunction &CGF,
+                                         llvm::Value *AddrWeakObj);
 };
 } // end anonymous namespace
 
@@ -968,6 +970,12 @@ void CGObjCGNU::EmitSynchronizedStmt(CodeGen::CodeGenFunction &CGF,
   CGF.ErrorUnsupported(&S, "@synchronized statement");
 }
 
+llvm::Value * CGObjCGNU::EmitObjCWeakCall(CodeGen::CodeGenFunction &CGF,
+                                          llvm::Value *AddrWeakObj)
+{
+  return 0;
+}
+
 CodeGen::CGObjCRuntime *CodeGen::CreateGNUObjCRuntime(CodeGen::CodeGenModule &CGM){
   return new CGObjCGNU(CGM);
 }

diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index 1591831458575c2ad5b95149a31315f8bfbcc418..f3cf21eb314bcf1b2dd6cfb14988f60a5647b25a 100644 (file)
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -454,7 +454,8 @@ public:
                              const ObjCAtThrowStmt &S);
   virtual void EmitSynchronizedStmt(CodeGen::CodeGenFunction &CGF,
                                     const ObjCAtSynchronizedStmt &S);
-  
+  virtual llvm::Value * EmitObjCWeakCall(CodeGen::CodeGenFunction &CGF,
+                                         llvm::Value *AddrWeakObj); 
 };
 } // end anonymous namespace
 
@@ -1775,6 +1776,17 @@ void CodeGenFunction::EmitJumpThroughFinally(ObjCEHEntry *E,
   EmitBranch(ExecuteTryExit ? E->FinallyBlock : E->FinallyNoExit);
 }
 
+/// EmitObjCWeakCall - Code gen for loading value of a __weak
+/// object: objc_read_weak (id *src)
+///
+llvm::Value * CGObjCMac::EmitObjCWeakCall(CodeGen::CodeGenFunction &CGF,
+                                          llvm::Value *AddrWeakObj)
+{
+  llvm::Value *read_weak = CGF.Builder.CreateCall(ObjCTypes.GcReadWeakFn,
+                                                  AddrWeakObj, "weakobj");
+  return read_weak;
+}
+
 /// EmitSynchronizedStmt - Code gen for @synchronized(expr) stmt;
 /// Effectively generating code for:
 /// objc_sync_enter(expr);

diff --git a/lib/CodeGen/CGObjCRuntime.h b/lib/CodeGen/CGObjCRuntime.h
index 435e1483e386f33ade59c87172c26460aa13b0a7..37544e47e1bc361e6408f074b7cb40afd5ada7b1 100644 (file)
--- a/lib/CodeGen/CGObjCRuntime.h
+++ b/lib/CodeGen/CGObjCRuntime.h
@@ -145,6 +145,8 @@ public:
                              const ObjCAtThrowStmt &S) = 0;
   virtual void EmitSynchronizedStmt(CodeGen::CodeGenFunction &CGF,
                                     const ObjCAtSynchronizedStmt &S) = 0;
+  virtual llvm::Value * EmitObjCWeakCall(CodeGen::CodeGenFunction &CGF,
+                                        llvm::Value *AddrWeakObj) = 0;
 };
 
 /// Creates an instance of an Objective-C runtime class.  

diff --git a/lib/CodeGen/CGValue.h b/lib/CodeGen/CGValue.h
index 505381eb41a211b655486fd9ff0379f42b724959..ef2cb033c95a96f631272379e52f707e019a3253 100644 (file)
--- a/lib/CodeGen/CGValue.h
+++ b/lib/CodeGen/CGValue.h
@@ -138,6 +138,10 @@ private:
   static void SetQualifiers(unsigned Qualifiers, LValue& R) {
     R.Volatile = (Qualifiers&QualType::Volatile)!=0;
     R.Restrict = (Qualifiers&QualType::Restrict)!=0;
+    // FIXME: Convenient place to set objc flags to 0. This
+    // should really be done in a user-defined constructor instead.
+    R.ObjcWeak = 0;
+    R.ObjcStrong = 0;
   }
   
 public: