summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Chisnall <csdavec@swan.ac.uk>2011-06-30 10:14:37 +0000
committerDavid Chisnall <csdavec@swan.ac.uk>2011-06-30 10:14:37 +0000
commit08d6733ed7e11ad872ef382eb5bd4a925b18f21d (patch)
treeb9fe25eda7cba29a24d0eb65d0965c2abc0ba679
parent2caedf449e640d14919402c7da27a36436971b95 (diff)
downloadbcm5719-llvm-08d6733ed7e11ad872ef382eb5bd4a925b18f21d.tar.gz
bcm5719-llvm-08d6733ed7e11ad872ef382eb5bd4a925b18f21d.zip
Add support for weakly imported classes (GNU runtime).
llvm-svn: 134140
-rw-r--r--clang/lib/CodeGen/CGObjCGNU.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/clang/lib/CodeGen/CGObjCGNU.cpp b/clang/lib/CodeGen/CGObjCGNU.cpp
index 81a3ffacbd8..0f53cd668f4 100644
--- a/clang/lib/CodeGen/CGObjCGNU.cpp
+++ b/clang/lib/CodeGen/CGObjCGNU.cpp
@@ -393,7 +393,8 @@ private:
/// is no class of the matching name.
void EmitClassRef(const std::string &className);
/// Emits a pointer to the named class
- llvm::Value *GetClassNamed(CGBuilderTy &Builder, const std::string &Name);
+ llvm::Value *GetClassNamed(CGBuilderTy &Builder, const std::string &Name,
+ bool isWeak);
protected:
/// Looks up the method for sending a message to the specified object. This
/// mechanism differs between the GCC and GNU runtimes, so this method must be
@@ -776,7 +777,8 @@ CGObjCGNU::CGObjCGNU(CodeGenModule &cgm, unsigned runtimeABIVersion,
}
llvm::Value *CGObjCGNU::GetClassNamed(CGBuilderTy &Builder,
- const std::string &Name) {
+ const std::string &Name,
+ bool isWeak) {
llvm::Value *ClassName = CGM.GetAddrOfConstantCString(Name);
// With the incompatible ABI, this will need to be replaced with a direct
// reference to the class symbol. For the compatible nonfragile ABI we are
@@ -785,7 +787,8 @@ llvm::Value *CGObjCGNU::GetClassNamed(CGBuilderTy &Builder,
//
// Libobjc2 contains an LLVM pass that replaces calls to objc_lookup_class
// with memoized versions or with static references if it's safe to do so.
- EmitClassRef(Name);
+ if (!isWeak)
+ EmitClassRef(Name);
ClassName = Builder.CreateStructGEP(ClassName, 0);
llvm::Constant *ClassLookupFn =
@@ -798,10 +801,10 @@ llvm::Value *CGObjCGNU::GetClassNamed(CGBuilderTy &Builder,
// techniques can modify the name -> class mapping.
llvm::Value *CGObjCGNU::GetClass(CGBuilderTy &Builder,
const ObjCInterfaceDecl *OID) {
- return GetClassNamed(Builder, OID->getNameAsString());
+ return GetClassNamed(Builder, OID->getNameAsString(), OID->isWeakImported());
}
llvm::Value *CGObjCGNU::EmitNSAutoreleasePoolClassRef(CGBuilderTy &Builder) {
- return GetClassNamed(Builder, "NSAutoreleasePool");
+ return GetClassNamed(Builder, "NSAutoreleasePool", false);
}
llvm::Value *CGObjCGNU::GetSelector(CGBuilderTy &Builder, Selector Sel,
OpenPOWER on IntegriCloud