Add codegen support for ObjC message expressions with the GNU runtime.
Patch by David Chisnall!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47789 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CodeGen/CGExprConstant.cpp b/CodeGen/CGExprConstant.cpp
index ec16b16..30180c1 100644
--- a/CodeGen/CGExprConstant.cpp
+++ b/CodeGen/CGExprConstant.cpp
@@ -200,6 +200,9 @@
// Make sure we have an array at this point
assert(0 && "Unable to handle InitListExpr");
+ // Get rid of control reaches end of void function warning.
+ // Not reached.
+ return 0;
}
llvm::Constant *VisitImplicitCastExpr(ImplicitCastExpr *ICExpr) {
diff --git a/CodeGen/CGExprScalar.cpp b/CodeGen/CGExprScalar.cpp
index 85831d5..52b022b 100644
--- a/CodeGen/CGExprScalar.cpp
+++ b/CodeGen/CGExprScalar.cpp
@@ -41,9 +41,14 @@
: public StmtVisitor<ScalarExprEmitter, Value*> {
CodeGenFunction &CGF;
llvm::LLVMFoldingBuilder &Builder;
+ CGObjCRuntime *Runtime;
+
+
public:
- ScalarExprEmitter(CodeGenFunction &cgf) : CGF(cgf), Builder(CGF.Builder) {
+ ScalarExprEmitter(CodeGenFunction &cgf) : CGF(cgf),
+ Builder(CGF.Builder),
+ Runtime(CGF.CGM.getObjCRuntime()) {
}
@@ -120,6 +125,7 @@
return llvm::ConstantInt::get(EC->getInitVal());
return EmitLoadOfLValue(E);
}
+ Value *VisitObjCMessageExpr(ObjCMessageExpr *E);
Value *VisitArraySubscriptExpr(ArraySubscriptExpr *E);
Value *VisitMemberExpr(Expr *E) { return EmitLoadOfLValue(E); }
Value *VisitOCUVectorElementExpr(Expr *E) { return EmitLoadOfLValue(E); }
@@ -443,6 +449,47 @@
return llvm::UndefValue::get(CGF.ConvertType(E->getType()));
}
+Value *ScalarExprEmitter::VisitObjCMessageExpr(ObjCMessageExpr *E) {
+ // Only the lookup mechanism and first two arguments of the method
+ // implementation vary between runtimes. We can get the receiver and
+ // arguments in generic code.
+
+ // Find the receiver
+ llvm::Value * Receiver = CGF.EmitScalarExpr(E->getReceiver());
+
+ // Process the arguments
+ unsigned int ArgC = E->getNumArgs();
+ llvm::SmallVector<llvm::Value*, 16> Args;
+ for(unsigned i=0 ; i<ArgC ; i++) {
+ Expr *ArgExpr = E->getArg(i);
+ QualType ArgTy = ArgExpr->getType();
+ if (!CGF.hasAggregateLLVMType(ArgTy)) {
+ // Scalar argument is passed by-value.
+ Args.push_back(CGF.EmitScalarExpr(ArgExpr));
+ } else if (ArgTy->isComplexType()) {
+ // Make a temporary alloca to pass the argument.
+ llvm::Value *DestMem = CGF.CreateTempAlloca(ConvertType(ArgTy));
+ CGF.EmitComplexExprIntoAddr(ArgExpr, DestMem, false);
+ Args.push_back(DestMem);
+ } else {
+ llvm::Value *DestMem = CGF.CreateTempAlloca(ConvertType(ArgTy));
+ CGF.EmitAggExpr(ArgExpr, DestMem, false);
+ Args.push_back(DestMem);
+ }
+ }
+
+ // Get the selector string
+ std::string SelStr = E->getSelector().getName();
+ llvm::Constant *Selector = CGF.CGM.GetAddrOfConstantString(SelStr);
+ ConvertType(E->getType());
+ return Runtime->generateMessageSend(Builder,
+ ConvertType(E->getType()),
+ Receiver,
+ Selector,
+ &Args[0],
+ Args.size());
+}
+
Value *ScalarExprEmitter::VisitArraySubscriptExpr(ArraySubscriptExpr *E) {
// Emit subscript expressions in rvalue context's. For most cases, this just
// loads the lvalue formed by the subscript expr. However, we have to be
diff --git a/CodeGen/CodeGenModule.cpp b/CodeGen/CodeGenModule.cpp
index e318133..5e63a80 100644
--- a/CodeGen/CodeGenModule.cpp
+++ b/CodeGen/CodeGenModule.cpp
@@ -31,7 +31,14 @@
llvm::Module &M, const llvm::TargetData &TD,
Diagnostic &diags)
: Context(C), Features(LO), TheModule(M), TheTargetData(TD), Diags(diags),
- Types(C, M, TD), MemCpyFn(0), MemSetFn(0), CFConstantStringClassRef(0) {}
+ Types(C, M, TD), MemCpyFn(0), MemSetFn(0), CFConstantStringClassRef(0) {
+ //TODO: Make this selectable at runtime
+ Runtime = CreateObjCRuntime(M);
+}
+
+CodeGenModule::~CodeGenModule() {
+ delete Runtime;
+}
/// WarnUnsupported - Print out a warning that codegen doesn't support the
/// specified stmt yet.
diff --git a/CodeGen/CodeGenModule.h b/CodeGen/CodeGenModule.h
index 7863f7b..80ce307 100644
--- a/CodeGen/CodeGenModule.h
+++ b/CodeGen/CodeGenModule.h
@@ -15,6 +15,7 @@
#define CLANG_CODEGEN_CODEGENMODULE_H
#include "CodeGenTypes.h"
+#include "CGObjCRuntime.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringMap.h"
@@ -52,6 +53,7 @@
const llvm::TargetData &TheTargetData;
Diagnostic &Diags;
CodeGenTypes Types;
+ CGObjCRuntime *Runtime;
llvm::Function *MemCpyFn;
llvm::Function *MemSetFn;
@@ -65,7 +67,9 @@
public:
CodeGenModule(ASTContext &C, const LangOptions &Features, llvm::Module &M,
const llvm::TargetData &TD, Diagnostic &Diags);
+ ~CodeGenModule();
+ CGObjCRuntime *getObjCRuntime() { return Runtime; }
ASTContext &getContext() const { return Context; }
const LangOptions &getLangOptions() const { return Features; }
llvm::Module &getModule() const { return TheModule; }