diff options
| -rw-r--r-- | clang/lib/CodeGen/CGExpr.cpp | 17 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGExprAgg.cpp | 8 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 7 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGStmt.cpp | 19 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.h | 2 |
5 files changed, 52 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index f0c056fadde..a191610d1f5 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -104,8 +104,17 @@ LValue CodeGenFunction::EmitLValue(const Expr *E) { case Expr::StringLiteralClass: return EmitStringLiteralLValue(cast<StringLiteral>(E)); + case Expr::ObjCMessageExprClass: + return EmitObjCMessageExprLValue(cast<ObjCMessageExpr>(E)); case Expr::ObjCIvarRefExprClass: return EmitObjCIvarRefLValue(cast<ObjCIvarRefExpr>(E)); + case Expr::ObjCPropertyRefExprClass: { + // FIXME: Implement! + ErrorUnsupported(E, "l-value expression (Objective-C property reference)"); + llvm::Type *Ty = llvm::PointerType::getUnqual(ConvertType(E->getType())); + return LValue::MakeAddr(llvm::UndefValue::get(Ty), + E->getType().getCVRQualifiers()); + } case Expr::UnaryOperatorClass: return EmitUnaryOpLValue(cast<UnaryOperator>(E)); @@ -734,6 +743,14 @@ LValue CodeGenFunction::EmitCallExprLValue(const CallExpr *E) { E->getType().getCVRQualifiers()); } +LValue CodeGenFunction::EmitObjCMessageExprLValue(const ObjCMessageExpr *E) { + // Can only get l-value for message expression returning aggregate type + RValue RV = EmitObjCMessageExpr(E); + // FIXME: can this be volatile? + return LValue::MakeAddr(RV.getAggregateAddr(), + E->getType().getCVRQualifiers()); +} + LValue CodeGenFunction::EmitObjCIvarRefLValue(const ObjCIvarRefExpr *E) { // Objective-C objects are traditionally C structures with their layout // defined at compile-time. In some implementations, their layout is not diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp index bc6af1251e5..fbba9c6c0c4 100644 --- a/clang/lib/CodeGen/CGExprAgg.cpp +++ b/clang/lib/CodeGen/CGExprAgg.cpp @@ -88,7 +88,13 @@ public: void VisitBinComma(const BinaryOperator *E); void VisitObjCMessageExpr(ObjCMessageExpr *E); - + void VisitObjCIvarRefExpr(ObjCIvarRefExpr *E) { + EmitAggLoadOfLValue(E); + } + void VisitObjCPropertyRefExpr(ObjCPropertyRefExpr *E) { + // FIXME: Implement! + CGF.ErrorUnsupported(E, "aggregate expression (Objective-C property reference)"); + } void VisitConditionalOperator(const ConditionalOperator *CO); void VisitInitListExpr(InitListExpr *E); diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index ddf1421b98e..3f7b7377523 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -134,6 +134,13 @@ public: Value *VisitObjCSelectorExpr(ObjCSelectorExpr *E); Value *VisitObjCProtocolExpr(ObjCProtocolExpr *E); Value *VisitObjCIvarRefExpr(ObjCIvarRefExpr *E) { return EmitLoadOfLValue(E);} + Value *VisitObjCPropertyRefExpr(ObjCPropertyRefExpr *E) { + CGF.ErrorUnsupported(E, "scalar expression (Objective-C property reference)"); + if (E->getType()->isVoidType()) + return 0; + return llvm::UndefValue::get(CGF.ConvertType(E->getType())); + } + Value *VisitArraySubscriptExpr(ArraySubscriptExpr *E); Value *VisitShuffleVectorExpr(ShuffleVectorExpr *E); Value *VisitMemberExpr(Expr *E) { return EmitLoadOfLValue(E); } diff --git a/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp index daad0626196..22370acc6d0 100644 --- a/clang/lib/CodeGen/CGStmt.cpp +++ b/clang/lib/CodeGen/CGStmt.cpp @@ -76,6 +76,25 @@ void CodeGenFunction::EmitStmt(const Stmt *S) { case Stmt::DefaultStmtClass: EmitDefaultStmt(cast<DefaultStmt>(*S)); break; case Stmt::CaseStmtClass: EmitCaseStmt(cast<CaseStmt>(*S)); break; case Stmt::AsmStmtClass: EmitAsmStmt(cast<AsmStmt>(*S)); break; + + case Stmt::ObjCAtTryStmtClass: + ErrorUnsupported(S, "@try statement"); + break; + case Stmt::ObjCAtCatchStmtClass: + ErrorUnsupported(S, "@catch statement"); + break; + case Stmt::ObjCAtFinallyStmtClass: + ErrorUnsupported(S, "@finally statement"); + break; + case Stmt::ObjCAtThrowStmtClass: + ErrorUnsupported(S, "@throw statement"); + break; + case Stmt::ObjCAtSynchronizedStmtClass: + ErrorUnsupported(S, "@synchronized statement"); + break; + case Stmt::ObjCForCollectionStmtClass: + ErrorUnsupported(S, "for ... in statement"); + break; } } diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h index 37b242e29e4..0d82e32861f 100644 --- a/clang/lib/CodeGen/CodeGenFunction.h +++ b/clang/lib/CodeGen/CodeGenFunction.h @@ -272,7 +272,9 @@ public: LValue EmitLValueForField(llvm::Value* Base, FieldDecl* Field, bool isUnion, unsigned CVRQualifiers); + LValue EmitObjCMessageExprLValue(const ObjCMessageExpr *E); LValue EmitObjCIvarRefLValue(const ObjCIvarRefExpr *E); + //===--------------------------------------------------------------------===// // Scalar Expression Emission //===--------------------------------------------------------------------===// |
